Feature request: rerere support for sequential commit conflicts #12319
Description
Problem
When rebasing a branch where multiple commits conflict on the same lines, I have to resolve the same conflict over and over — once per commit. The resolution is identical each time.
In my case, I had a feature branch with 4 commits that all touched the same function. Upstream refactored the base class. All 4 commits conflicted on the same lines, same resolution. I resolved it, advanced, got the same conflict, resolved it again, and so on 4 times.
Git has a solution for this
git rerere records how you resolve a conflict and replays that resolution when it sees the same conflict again. It's built exactly for this scenario.
But GitButler uses libgit2 for its rebase flow, and libgit2 doesn't implement rerere. So rerere.enabled = true in git config has no effect — the resolution database is never consulted.
What I'd like
After resolving a conflict during a rebase, GitButler should auto-apply the same resolution to subsequent commits that have the same conflict. Whether that's native rerere-like logic, shelling out to git rerere, or just remembering resolutions within a single rebase operation — any of those would work.