Bugzilla – Full Text Bug Listing
| Summary: | Merge command errors show too little user feedback | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Malgorzata Janczarska <malgorzata.tomczyk> |
| Component: | Git | Assignee: | Project Inbox <orion.git-inbox> |
| Status: | CLOSED DUPLICATE | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | Szymon.Brandys, tomasz.zarna |
| Version: | 0.4 | ||
| Target Milestone: | 0.5 | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| Whiteboard: | |||
I think we can fix that during the general gitCommand.js polish in .5. *** This bug has been marked as a duplicate of bug 357860 *** |
Some merge errors show very little user feedback. For instance when merge failed because there are uncommitted changes conflicting with the incoming changes we only get "FAILED" with no other details. In this case there is the feedback from the server with code 200: { "FailingPaths": {"gotom.js": "DIRTY_INDEX"}, "Result": "FAILED" } But client does not understand this information and displays only "FAILED" without even marking is as a failure. We can two ways to solve this: * the response from server is in the format of ServerStatus with corresponding httpCode - this is well established format that client should hopefully understand * we will establish a documented format of error feedback from the server and implement handling it on the client side