问题
Once I've merged my branch with another. I haven't resolve the conflicts that were made. I have been merging till recently, till I figured out that lots of "<<<<" were added to my code. I believe it's related to the unresolved merge conflicts. I try to solve the conflicts in my last merge with "theirs" strategy. Unfortunately, it didn't have any effect on the previous unresolved conflicts. How do I resolve all the unresolved conflicts with the "theirs strategy"?
Thanks!
回答1:
try reset the code then merge the code again.
say you are on branchA and want to merge branchB
git reset --hard branchA
git merge -X theirs branchB
来源：https://stackoverflow.com/questions/41649147/git-resolving-previous-merge-conflicts