Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 339111 - [server] Provide REST API for git merge
Summary: [server] Provide REST API for git merge
Status: RESOLVED FIXED
Alias: None
Product: Orion
Classification: ECD
Component: Git (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows XP
: P2 normal (vote)
Target Milestone: 0.2   Edit
Assignee: Tomasz Zarna CLA
QA Contact:
URL: http://www.kernel.org/pub/software/sc...
Whiteboard:
Keywords:
Depends on:
Blocks: 339114 339722
  Show dependency tree
 
Reported: 2011-03-07 11:08 EST by Tomasz Zarna CLA
Modified: 2011-09-01 09:52 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 Tomasz Zarna CLA 2011-03-07 11:08:10 EST 
We're going to need REST API for git merge (merging branches).
Comment 1 Tomasz Zarna CLA 2011-04-14 08:27:20 EDT 
Fixed with http://git.eclipse.org/c/e4/org.eclipse.orion.server.git/commit/?id=2fba7e5fbb3bc56e97392e9674febc277c2f866b. I will open a separate bug to make the server return a meaningful response with the merge result e.g. Already up-to-date or Conflict occurred.