When a rebase happens and git rerere is enabled, will it automatically be invoked after a second conflict that was previously resolved emerges or do I need to manually call git rerere? I'm asking this because I'd like to know whether GUIs like TortoiseGit support rerere. But this would only be the case if it is automaticaally invoked.
TortoiseGit uses cherry-pick
internally for implementing rebase. Therefore, git rerere
is automatically invoked. However, even if conflicts are automatically resolved, the files are still marked as conflicted (you should not use "Edit conflict", but the options "Open" and "Resolved") as TortoiseGitMerge will not re-use the already resovled conflicts.