Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 303404 - Missing Team Options Pull from and Merge
Summary: Missing Team Options Pull from and Merge
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 0.10.0-M1   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 304836 (view as bug list)
Depends on: 318438 318439 318442 318447 319843 319844
Blocks: 293192 316208
  Show dependency tree
 
Reported: 2010-02-20 04:58 EST by ekkehard gentz CLA
Modified: 2010-10-13 04:57 EDT (History)
20 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description ekkehard gentz CLA 2010-02-20 04:58:08 EST 
perhaps I overlooked something, but I only found
Team Options Fetch...

I didn't found
Team Options Pull...
which is a combination of Fetch + Merge
but I also didn't found Merge

but I'm new to Git/EGit - perhaps there are other ways to do this from inside Eclipse ?
Comment 1 Matthias Sohn CLA 2010-02-26 04:17:11 EST 
- we are currently working on the integration of merge into the UI
Comment 2 Lars Vogel CLA 2010-03-05 12:22:15 EST 
*** Bug 304836 has been marked as a duplicate of this bug. ***
Comment 3 Mykola Nikishov CLA 2010-03-16 05:34:03 EDT 
Should this be a blocker for bug#303403?
Comment 4 Mykola Nikishov CLA 2010-03-16 05:35:50 EDT 
There is nothing OS- or platform-specific.
Comment 5 Eugene Sajine CLA 2010-04-09 09:41:32 EDT 
(In reply to comment #1)
> - we are currently working on the integration of merge into the UI

Just out of curiosity: when it is planned to become available? What is the target milestone for merge support?
Comment 6 Rotem CLA 2010-05-08 03:52:54 EDT 
(In reply to comment #5)
Join to the question.
Is there any planed date?
Comment 7 David Carver CLA 2010-05-13 17:25:51 EDT 
This is one of the big items that is keeping some of my team in the company I work for from truely giving eGit a work out.
Comment 8 Stefan Lay CLA 2010-05-19 12:31:07 EDT 
A first version to trigger fast-forward merge is proposed with http://egit.eclipse.org/r/#change,723 (jgit) and http://egit.eclipse.org/r/#change,723 (egit)
Comment 9 Mathias Kinzler CLA 2010-10-13 04:03:51 EDT 
Code review at http://egit.eclipse.org/r/#change,1725
Comment 10 Mathias Kinzler CLA 2010-10-13 04:57:09 EDT 
Merged as 39da7d34c48bf89ebf546f9ac49497a4e1ab8391. We now have fetch and pull.