Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 342843

Summary: [server] REST API for "git merge" should return result of the merge
Product: [ECD] Orion Reporter: Tomasz Zarna <tomasz.zarna>
Component: ClientAssignee: Tomasz Zarna <tomasz.zarna>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: Szymon.Brandys
Version: 0.2   
Target Milestone: 0.2   
Hardware: PC   
OS: Windows XP   
Whiteboard:
Attachments:
Description Flags
mylyn/context/zip none

Description Tomasz Zarna CLA 2011-04-14 10:26:42 EDT 
Currently, if the merge operation wasn't interrupted with an exception the response will always be 200 (OK), no matter if the merge resulted in a conflict, went fine or failed. The merge result should be part of the response.
Comment 1 Tomasz Zarna CLA 2011-04-20 06:53:55 EDT 
Created attachment 193682 [details]
mylyn/context/zip
Comment 2 Tomasz Zarna CLA 2011-04-20 06:54:38 EDT 
Fixed with http://git.eclipse.org/c/e4/org.eclipse.orion.server.git/commit/?id=b1769b1c84d5e7e1a32115da176a055a5d8250dc. Look for "Result" in JSON response.