Resolving same conflicts again and again when doing rebasing more times

Question

I'm using git.

I'm working on branch, let say it is branch A.
And when something changes on master, I usually want to take those changes, I'm doing that by rebasing branch A.

The problem is that, that I have like 50-60 commits on branch A and every time small change happens on master I need to do rebase and re resolve all of conflicts.
It would be nice that I could just resolve new conflicts if there is any.

Is there a way to do that in git?

Answer 1

You can see if git rerere would help in your case.

You need to activate it first in your current repo:

git config --global rerere.enabled 1

Then this "reuse recorded resolution" script will allow Git to remember how you've resolved a hunk conflict.
See Rerere Your Boat...: