Bugzilla – Full Text Bug Listing
| Summary: | [client][git]Merge with conflict - no error on UI | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | Malgorzata Janczarska <malgorzata.tomczyk> |
| Component: | Client | Assignee: | Malgorzata Janczarska <malgorzata.tomczyk> |
| Status: | RESOLVED DUPLICATE | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | tomasz.zarna |
| Version: | 0.2 | ||
| Target Milestone: | --- | ||
| Hardware: | PC | ||
| OS: | Windows XP | ||
| Whiteboard: | |||
| Bug Depends on: | |||
| Bug Blocks: | 343542 | ||
We already have a bug for it, see bug 347986. *** This bug has been marked as a duplicate of bug 347986 *** |
When we have conflict in merge (unstaged changes in conflicting file), we have an error responce: {"HttpCode":500,"DetailedMessage":"Checkout conflict with files: \ngotom.js","Message":"An error occured when merging.","Severity":"Error","Code":0}, but on UI we don't display any information. We should display the message and a link to git status.