Re: Preserve merge changes with rebase -p
Le mardi 21 juin 2011 16:44:48, Andrew Wong a écrit :
Show 6 quoted lines
> Unfortunately, I don't think there's any nice way to do it right now. I
> think what you could do for now is make the "pick <M>" into a "edit
> <M>", together with other changes you want to make. And then when you
> get to "edit M", do a "git cherry-pick -n -m 1 <M>", or "-m 2" depending
> on how your merge was done. That should bring your changes over. Then
> you just need resolve and add any conflicts, and do a "rebase --continue".
Thank you, I'll try that the next time.
> I imagine this is pretty useful feature to have too. I could look into
> adding this support when I got a chance.
That would be great, many thanks in advance!
Cheers,
Matteo
--
Ma clef GPG est disponible sur keyserver.veridis.com
My GPG key is available on keyserver.veridis.com