On 2017-07-11, Simon King <simon.k...@uni-jena.de> wrote:
> Being on a different git branch, I tried
> git cherry-pick xyz
Could a different strategy help? When I did
git cherry-pick --strategy=recursive -X theirs xyz
I actually got no conflict at all.
But there *should* be a conflict here! After all, the changeset
from xyz doesn't apply to version B of my_file!
What I got from the above command was: Outside of the changeset,
my_file was as in version B (which is good), but the place where
git applied the changeset now looks like A+changeset (which is bad).
I would expect that git does report a conflict. So, the option
"-X theirs" seems not to be the solution.
Best regards,
Simon
--
You received this message because you are subscribed to the Google Groups
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at https://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
