Geek asks and answers

Resolving the same conflicts over and over when reinstalling

I am using git.

I’m working on a branch, let’s say it’s a branch A.
And when something changes to master, I usually want to accept these changes, I do this by reloading the branch A.

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

Is there any way to do this in git?

+3
source share
1 answer

You can see if it helps git rererein your case.

:

git config --global rerere.enabled 1

" " script Git , hunk.
. Rerere Your Boat...:

git rerere

+5

More articles:


All Articles