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 introduced code is not even part of the conflict. Current
theory is that there's a bug in git 1.8.1. Will try latest release.
I can reproduce this easily but unfortunately the used code if closed. I
have contacted our IT dept. and they are looking at it.
Cheers,
--
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.
