Issue 305: Submitting merge commit fails with cherry-pick strategy
Status:  Released
Owner:
Closed:  Oct 2012
Cc:
Project Member Reported by bklarson@gmail.com, Oct 20, 2009
Affected Version: 2.0.23

What steps will reproduce the problem?
1. Upload a change with multiple parents
2. Set the merge strategy for the project to Cherry-Pick
3. Try to submit the change

What is the expected output? What do you see instead?
Expect the merge commit to be pushed.  Instead we get an error saying 'Your 
change could not be merged due to a path conflict.'

See more details at http://groups.google.com/group/repo-
discuss/browse_thread/thread/b3a17e8f6ed7e10a

Oct 20, 2009
Project Member #1 bklarson@gmail.com
Sorry if this is a duplicate.  I did a quick search and didn't find much.

I put myself as the owner.  I'll try to fix it if/as I have time, but feel free to 
take this from me if anyone else is interested.
Oct 21, 2009
Project Member #3 bklarson@gmail.com
Ugh my fault, this has already been fixed as http://android.git.kernel.org/?
p=tools/gerrit.git;a=commit;h=0eec32dcbb776fdc06fe51b2baf2116d043000e2 and is included 
in 2.0.22.
Status: Fixed
Oct 29, 2009
#4 sop+code@google.com
(No comment was entered for this change.)
Labels: FixedIn-2.0.22
Oct 21, 2012
#5 sop@google.com
(No comment was entered for this change.)
Status: Released