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

Bug 390553

Summary:	Merge failed if there are conflicts.
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Git	Assignee:	Malgorzata Janczarska <malgorzata.tomczyk>
Status:	RESOLVED FIXED	QA Contact:
Severity:	critical
Priority:	P3	CC:	malgorzata.tomczyk, susan, Szymon.Brandys
Version:	0.5
Target Milestone:	1.0 RC1
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description libing wang

2012-09-27 09:00:58 EDT

I had changes in my work space (ide.css, globalCommands.js) and today when I use git status to fetch, it failed on merge.
I refreshed status page, the incoming changes were not merged.
Then I tried to click on all those 20 incoming commits and figured out that one of them are changing the same files as I did.

I tried to merge several times and no luck.
I had to copy my files to a temporary folder in my work space and check them out in git status page.
After merging back again, I had to compare the latest with the one in the temporary folder.(Thanks we have the compare any two files feature)

Comment 1 libing wang

2012-09-27 10:28:45 EDT

Here is the message coming from sever
{
  "FailingPaths": {"bundles/org.eclipse.orion.client.core/web/orion/globalCommands.js": "DIRTY_WORKTREE"},
  "Result": "FAILED"
}

You can reproduce the isssue in another way:
1.Do a fetch
2.If there is incoming changes, change any files involved in the commits.
3. Try to merge
4.It says failed.

Comment 2 libing wang

2012-09-27 10:38:23 EDT

I raised this to critical because no matter your changes are relevant to a conflict or not, as long as you are changing the same file as modified by one of the incoming commits, you are not able to merge at all.
Really blocking the git work flow.

Comment 3 Malgorzata Janczarska

2012-10-02 06:48:44 EDT

Fixed.