Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 348721 - [client][git]Merge with conflict - no error on UI
Summary: [client][git]Merge with conflict - no error on UI
Status: RESOLVED DUPLICATE of bug 347986
Alias: None
Product: Orion
Classification: ECD
Component: Client (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows XP
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Malgorzata Janczarska CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 343542
  Show dependency tree
 
Reported: 2011-06-08 08:51 EDT by Malgorzata Janczarska CLA
Modified: 2011-08-30 10:22 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Malgorzata Janczarska CLA 2011-06-08 08:51:25 EDT 
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.
Comment 1 Tomasz Zarna CLA 2011-06-09 10:48:19 EDT 
We already have a bug for it, see bug 347986.

*** This bug has been marked as a duplicate of bug 347986 ***