Home/ Questions/Q 8908295
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-15T03:08:31+00:00

Let’s assume I merge git and there is a merge conflict. My question is:

  • 0

Let’s assume I merge git and there is a merge conflict.

My question is: how can I force git to always choose the newer version of code in conflict so I won’t need to resolve the conflict by hand?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    It is not exactly the “newer” version, but you can tell git to always prefer the version on the current branch using git merge branch -X ours, or to prefer the version of the branch being merged, using git merge branch -X theirs.

    From man git-merge:

    ours:

    This option forces conflicting hunks to be auto-resolved cleanly by favoring our version. Changes from the other tree that do not
    conflict with our side are reflected to the merge result. For a binary file, the entire contents are taken from our side.

    theirs:

    This is the opposite of “ours”.

    • 0