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 and commit. When I check 
the committed code I am amazed to see changes that didn't exist in A but 
did exist in feature. So, for some reason cherry-picking made some bits of 
code in master similar to feature that were not present in patch A. How can 
this happen?

I thought have thought that this wouldn't be possible and cherry-picking 
would be more like a git format-patch + git apply with a nicer interface.


Paulo Matos

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to