Git rebase conflict on every commit -- fixup strategy

During interactive rebase, the same conflict appears on every commit in the rebase. Resolving it once does not prevent it from recurring on the next commit.

Enable rerere (reuse recorded resolution): git config rerere.enabled true. Git remembers how you resolved each conflict and automatically applies the same resolution. For current rebase: resolve once, git rerere will learn it. Alternative: squash related commits before rebasing to reduce conflict surface. If stuck: git rebase --abort to start over.

Each commit in a rebase is replayed independently. If multiple commits touch the same conflicting area, each one conflicts separately. rerere records and replays your resolution.