Bugzilla – Full Text Bug Listing
| Summary: | Merge when a file is dirty causes "Internal Error" dialog to pop-up + logs to error log | ||||||
|---|---|---|---|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | James Blackburn <jamesblackburn+eclipse> | ||||
| Component: | UI | Assignee: | Project Inbox <egit.ui-inbox> | ||||
| Status: | RESOLVED DUPLICATE | QA Contact: | |||||
| Severity: | normal | ||||||
| Priority: | P3 | ||||||
| Version: | 0.12 | ||||||
| Target Milestone: | --- | ||||||
| Hardware: | PC | ||||||
| OS: | Linux-GTK | ||||||
| Whiteboard: | |||||||
| Attachments: |
|
||||||
And it's a dupe... *** This bug has been marked as a duplicate of bug 327573 *** |
Created attachment 190864 [details] screenshot Using current nightly: Eclipse EGit (Incubation) 0.12.0.201103040937 org.eclipse.egit.feature.group Eclipse JGit (Incubation) 0.12.0.201103040915 org.eclipse.jgit.feature.group If you try to merge two branches, and the working tree is dirty (and the merge would touch the modified file), you get a very unfriendly internal error dialog (attached). Doing this in a test project, I get an Internal Error dialog, and two errors logged to the error log. Note you must press: "Details >>" to find out what caused the merge fail. For the same operation cgit says: "bash:jamesb:xl-cbga-20:32814> git merge branch1 Updating d1cfbf6..59a7ae8 error: Your local changes to 'asdf2' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge." Egit should be similarly helpful.