Hi, perhaps not intellectually satisfying, but if the change to cherry-pick is only one line, perhaps just rewriting the line by hand is the simplest way.
Ciao, Thierry On Tue, Jul 11, 2017 at 04:13:03PM +0000, Simon King wrote: > Hi Erik, > > On 2017-07-11, Erik Bray <erik.m.b...@gmail.com> wrote: > > cherry-pick basically does exactly that. If a patch doesn't apply > > with cherry-pick it will give you the opportunity to resolve the merge > > conflict manually, which you'll probably have to do no matter what in > > most cases. > > Sure. The point is that with my previous git settings, I had to resolve > literally hundreds of what git considered to be conflicts, even though > the commit that I wanted to cherry-pick touched just a single line. > > However, in discussion with Travis on trac, it has turned out that using > a different mergetool (here: kdiff3 instead of meld) can improve the > situation. > Namely, when I wanted to cherry-pick commit xyz from branch A into branch B, > then meld used A as starting point of the manual merge, not B. Thus, I > had to reconstruct all the hundreds of changes leading from A to B, plus the > small changeset. > > Actually in a small toy example that I describe in comment 8 of ticket #23400, > kdiff3 was able to resolve the small conflict automatically. > > 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. -- 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.
