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

Bug 339111

Summary:	[server] Provide REST API for git merge
Product:	[ECD] Orion	Reporter:	Tomasz Zarna <tomasz.zarna>
Component:	Git	Assignee:	Tomasz Zarna <tomasz.zarna>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P2	CC:	Szymon.Brandys
Version:	0.2
Target Milestone:	0.2
Hardware:	PC
OS:	Windows XP
URL:	http://www.kernel.org/pub/software/scm/git/docs/git-merge.html
Whiteboard:
Bug Depends on:
Bug Blocks:	339114, 339722

Description Tomasz Zarna

2011-03-07 11:08:10 EST

We're going to need REST API for git merge (merging branches).

Comment 1 Tomasz Zarna

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.