Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 347071

Summary:	Synchronize view merge does not merge
Product:	[Technology] EGit	Reporter:	Holger Staudacher <holger.staudacher>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	NEW ---	QA Contact:
Severity:	normal
Priority:	P3	CC:	dariusz.luksza, flood, matthias.sohn, mauromol, rsternberg
Version:	1.0
Target Milestone:	---
Hardware:	PC
OS:	Mac OS X - Carbon (unsup.)
Whiteboard:
Bug Depends on:
Bug Blocks:	426775

Description Holger Staudacher

2011-05-24 15:49:51 EDT

If I got this right than the following is the normal workflow in git. I normally fetch form a remote. After fetching I can compare the origin/master with my local master. When I have reviewed all changes I probably want to merge the origin/master into my local master. This is what a git pull does I think.

When I fetch from egit and synchronize (using the synchronize view) the local master with the origin/master I see all incoming changes. When I click merge on the context menu it merges the incoming changes into my working tree but does not update my local master. I think it should update it right?

Comment 1 Matthias Sohn

2011-06-28 07:33:28 EDT

This is a bug, verified your scenario

Comment 2 Mauro Molinari

2015-04-29 17:58:44 EDT

Also, the "Merge all non-conflicting changes" icon does this: it merges on the working dir, but does not perform the actual merge. This could be seen as a feature, because you may "cherry-pick" only the desired changes without performing the whole merge (there's the "Pull" button for this), but it's confusing IMHO.
Perhaps the "Merge all non conflicting changes" could prompt the use asking whether he/she wants to perform an actual merge or only a "local" merge.