Git: fatal: '--ours / - theirs' cannot be used with switch branches

Question

In a merge conflict, I try to resolve all merge conflicts in favor of a particular branch.

I try to do git checkout --ours , but I get the following error:

 fatal: '--ours/--theirs' cannot be used with switching branches 

How can I achieve what I am trying to do?

Answer 1

Using git checkout with --ours or --theirs expects at least one argument: file / directory path to check.

As the manual says:

When checking paths from the index, check step # 2 (ours) or # 3 (them) for unbound paths.

So:

 git checkout --ours <path(s)> 

Answer 2

Well, you can use cherry-pick to clone everything from the branch marked with --theirs to your current HEAD .

 git cherry-pick <commit you want to copy>