Hi!
Once more, I got annoyed either by git, or by my lacking git skills.
At #15820, the reviewer made some changes. There is a follow-up ticket
#16453, and I had to resolve conflicts for merging #15820 into #16453.
And then, there is a follow-follow-up ticket #17435. When merging #16453
into #17435, I was asked to resolve the same conflicts *again*, even
though I had solved them when merging #15820 into #16453.
So, given commits A,A',B,C depending like this
...--A--B--C
\
A'
how can one merge A' into B and C with least effort? At least in the
example above,
git checkout B
git merge A'
git mergetool # resolve conflicts
git commit -a
git checkout C
git merge B
would result in resolving the same conflicts twice. Certainly there is a
better way!?!
Side complication: The result of merging A' into B has already been
published. Hence, the solution should better not change B's history.
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 [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.
