Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 370853 - Merge fails, Orion fails
Summary: Merge fails, Orion fails
Status: CLOSED DUPLICATE of bug 357860
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: 0.4   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-02-07 11:45 EST by John J. Barton CLA
Modified: 2012-02-07 13:28 EST (History)
0 users

See Also:

Attachments
Merge failure page is not like described in the newsgroup (109.71 KB, image/png)
2012-02-07 11:45 EST, John J. Barton CLA 		no flags Details
View All 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 John J. Barton CLA 2012-02-07 11:45:24 EST 
Created attachment 210665 [details]
Merge failure page is not like described in the newsgroup

According to the UI, my merge has failed. According to John A, this should happen:
---
It works the same way in Orion. Doing a Git merge will attempt to auto-merge. If this fails you will get files with >>> markers showing you the conflicting areas. Conflicting files show up in the git status page in an unstaged state with a red bidirectional arrows next to them. Non-conflicting files will appear as staged. The conflicts need to be resolved by hand and then staged/committed. From your confusion I take it that this didn't happen for you, so maybe you've hit a bug. I suggest entering a bug with any details you can give... screen shots, etc.
---

But as you can see from the screenshot, I have no red markers. In fact the UI looks just like it did before I clicked merge except for the FAILED message.
Comment 1 John J. Barton CLA 2012-02-07 11:46:33 EST 
Web Inspector console FWIW

renderCommands: object,button>> WARNING: command parent must have an id
:8080/git/built-git-status.js:1047renderCommands: object,button>> WARNING: command parent must have an id
:8080/git/built-git-status.js:1047renderCommands: object,button>> WARNING: command parent must have an id
:8080/git/built-git-status.js:1047renderCommands: object,button>> WARNING: command parent must have an id
:8080/git/built-git-status.js:1047renderCommands: object,button>> WARNING: command parent must have an id
:8080/git/built-git-status.js:1047renderCommands: object,button>> WARNING: command parent must have an id
Comment 2 Susan McCourt CLA 2012-02-07 13:28:57 EST 
The warnings are not related.
This is bug 357860.  We still aren't sure how/why this happens.
Sorry we didn't remember this bug when you asked on the mailing list.

*** This bug has been marked as a duplicate of bug 357860 ***