Reuse or Recorded Resolutions

 

Set this up at project level...

git config rerere.enabled true


Merge conflict

• remember the files that are in conflict

 

git rerere status