3 ms·

You can use git rerere to avoid the repeated rebase conflicts.

• kelnos 6y ago
  As an obsessive rebaser, in practice I've found that rerere very rarely kicks in during a rebaser unless the conflict looks exactly the same across commit applications, which is rarely the case.