Bugzilla – Full Text Bug Listing
| Summary: | After a checkout conflict the UI does not tell us where we are | ||||||
|---|---|---|---|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | John J. Barton <johnjbarton> | ||||
| Component: | Git | Assignee: | Bogdan Gheorghe <gheorghe> | ||||
| Status: | RESOLVED FIXED | QA Contact: | |||||
| Severity: | normal | ||||||
| Priority: | P3 | CC: | simon_kaegi, Szymon.Brandys | ||||
| Version: | 0.4 | ||||||
| Target Milestone: | 7.0 | ||||||
| Hardware: | All | ||||||
| OS: | All | ||||||
| Whiteboard: | |||||||
| Attachments: |
|
||||||
This should be done in 5.0. Bogdan, do we have anything more to do here? . |
Created attachment 212098 [details] screenshot after checkout conflict I changed some files, then issued "git checkout master" from the UI. The result was a red X warning Checkout conflict with files: src/traceur.js test/unit/codegeneration/source_map_test.html But now what state am I in? Did the branch change apply? I guess not, since the UI does not highlight master. Are any of my files changed? Maybe? Usually when git says "conflict" it means it wrote >>>> into my files. But I don't know. Using the command line I verified that I was on master and no >>>> was added. The warning message should be more like: Checkout aborted with no changes. Change in file <...> conflicts with file on <target-branch>