During git merge feat with a conflict in f, what does git checkout --theirs f put in the working tree?
HEAD's version off- Both sides with markers
feat's version off- The merge base version
In a merge, "ours" is the current branch and "theirs" is the branch being merged in, here
Play Git ▸
feat.