2 ms·
When you rebase a lot you might have to do the same merge operation multiple times, unless you change the settings like is shown in the article. The trick here
by jayd16 7y ago
When you rebase a lot you might have to do the same merge operation multiple times, unless you change the settings like is shown in the article. The trick here saves the merge resolution locally so you can automatically merge again if you have to. I don't think this gets pushed so anyone else (or you but in a different repo) on that branch would also need to repeat the merge operation though.
If you save the merge commit, the merge itself is in the history so there's nothing to repeat.