Stop cherry-picking, start merging, Part 1: The merge conflict

Re:Stop cherry-picking, start merging, Part 1: The merge con... by phs2501 on Tuesday October 16, 2018 @09:36AM (#18229216)

Take a look at `--rebase-merges` if you haven't. It's new and kind of amazing. Works much better than `--preserve-merges` in my experience.

[ Parent | on HN ]

Re:Stop cherry-picking, start merging, Part 1: The merge con... by yebyen on Tuesday October 16, 2018 @10:39AM (#18229718)

Thanks! I meant to mention that --preserve-merges is not really for use with interactive rebase, and does not work at all with pull --rebase, but I was in a bit of a hurry.

I did not know about rebase-merges!

> The --rebase-merges mode is similar in spirit to --preserve-merges, but in contrast to that option works well in interactive rebases: commits can be reordered, inserted and dropped at will.

[ Parent | on HN ]