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

Bug 425729

Summary:	Cherry-Pick should preserve commit message in case of conflict
Product:	[ECD] Orion	Reporter:	Stefan Lay <stefan.lay>
Component:	Git	Assignee:	Project Inbox <orion.git-inbox>
Status:	RESOLVED WONTFIX	QA Contact:
Severity:	normal
Priority:	P3
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Mac OS X
Whiteboard:

Description Stefan Lay

2014-01-15 04:59:58 EST

Cherry-Pick a commit with conflicting changes. Resolve the commit in the git status page. Select Commit.

Clicking on commit opens a dialog to enter a commit message. The commit message of the cherry-picked commit is lost.

The commit message area should contain the commit message of the cherry-picked commit.

Comment 1 John Arthorne

2015-05-05 16:21:01 EDT

Closing as part of a mass clean up of inactive bugs. Please reopen if this problem still occurs or is relevant to you. For more details see:


https://dev.eclipse.org/mhonarc/lists/orion-dev/msg03444.html