$ ./guess_the_languageGit
Git · medium · #17

During git merge feat with a conflict in f, what does git checkout --theirs f put in the working tree?

  1. HEAD's version of f
  2. Both sides with markers
  3. feat's version of f
  4. The merge base version
In a merge, "ours" is the current branch and "theirs" is the branch being merged in, here feat.
Play Git ▸