git rerere
Resolves the conflict you already resolved — and never asks again.
The name spells the promise: reuse recorded resolution. With rerere.enabled on, git records every conflict you resolve by hand; when the same conflict reappears, it applies the recorded resolution on its own and moves along.
It is the insurance of anyone rebasing long-lived branches or keeping an integration branch: the conflict that would return on every rebase is paid for once. The memory lives in .git/rr-cache/ and outlasts sessions — months later, git still remembers.
$ git config rerere.enabled true
$ git rebase main
CONFLICT (content): Merge conflict in main.go
Resolved 'main.go' using previous resolution.