Git rebase conflicts appearing repeatedly on same files

During git rebase, the same conflict appears over and over on sequential commits. Resolving it once doesn't prevent it from showing up on the next commit in the rebase.

Enable rerere (reuse recorded resolution): git config --global rerere.enabled true. Git will record your conflict resolutions and automatically apply them when the same conflict appears again. For an ongoing painful rebase, consider git rebase --abort and using git merge instead, or squash commits before rebasing to reduce the number of conflict points.

Rebase replays each commit individually. If commit A and commit B both touch the same lines relative to the target, you'll get the conflict twice. rerere solves this by remembering resolutions.