On 21/10/2013 19:19, Johan 't Hart wrote:
You did
git cherry-pick HEAD..A
Instead of
git cherry-pick A
?
Or maybe the wrongly introduced code is around the conflict you
resolved?
No, I did
git cherry-pick A
and the wrongly introduced code is not around the conflict resolved.
Actually the
Hi,
I am seeing an unexpected effect of cherry-picking.
I have two branches master and feature where feature branched off master
awhile ago.
I commit patch A to feature (in this case it was to Makefile.in) and then I
cherry-picked A to master.
There are a few conflicts in A code which I fix
