On Sun, 7 Apr 2019, 20:46 , <neverasi...@gmail.com> wrote: > > In the while, I come back to my original question: what is *--merge* command > line option of *git rebase* command? >
Unless you have changed your default merge strategy that option does nothing if I've understood correctly. As far as I know, the rebase --merge is meant to restore the default behavior of rebase merge strategy. git rebase --help will provide the details. It's basically only about automatic merge conflict solution to use. If you don't have merge conflicts, it never does anything. Trying another strategy may help with highly complex conflicts. -- Mikko -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
