Bugzilla – Full Text Bug Listing
| Summary: | Merge fails, Orion fails | ||||||
|---|---|---|---|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | John J. Barton <johnjbarton> | ||||
| Component: | Git | Assignee: | Project Inbox <orion.git-inbox> | ||||
| Status: | CLOSED DUPLICATE | QA Contact: | |||||
| Severity: | normal | ||||||
| Priority: | P3 | ||||||
| Version: | 0.4 | ||||||
| Target Milestone: | --- | ||||||
| Hardware: | PC | ||||||
| OS: | Linux | ||||||
| Whiteboard: | |||||||
| Attachments: |
|
||||||
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 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 *** |
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.