@theresnotime `man git-rerere`. Doesn't solve all your problems (and probably adds new ones knowing git), but should at least mean you're not resolving the same conflicts again and again through a rebase
@theresnotime `man git-rerere`. Doesn't solve all your problems (and probably adds new ones knowing git), but should at least mean you're not resolving the same conflicts again and again through a rebase