Conflicts & Merge

How to Resolve Git Merge Conflicts Accepting Ours or Theirs

Quickly resolve merge conflicts across files by accepting all changes from your branch (--ours) or the incoming branch (--theirs).

Instant 1-Line Solution

Reversible (History Change)Intermediate

git checkout --ours <file> OR git checkout --theirs <file>

When to use this scenario:A generated file (like package-lock.json or schema.rb) has 100 conflict lines and you want to completely accept one version.

Step-by-Step Execution Guide

1Accept your current branch version (Ours)

git checkout --ours <file-path>

Replaces the conflicted file with the version from the branch you are currently on.

2Accept incoming branch version (Theirs)

git checkout --theirs <file-path>

Replaces the conflicted file with the incoming version from the branch being merged.

3Stage the resolved file and commit

git add <file-path> && git commit -m "fix: resolve conflict using theirs"

Marks the conflict as resolved and finalizes the merge.

Critical Pitfalls & Precautions

•During a "git rebase", the meanings of "ours" and "theirs" are swapped because rebase replays your commits onto upstream.

Frequently Asked Questions

Accept Ours / Theirs in Merge - Frequently Asked Questions

Common questions about safe rollback, remote history implications, and troubleshooting.

Run "git checkout --theirs ." followed by "git add ." to accept incoming changes across the entire workspace.

Related Git Command Guides

Browse All Git Recipes

Undo & HistorySafe

How to Undo the Last Commit in Git

Undo your most recent Git commit while keeping all your edited files staged or unstaged in your working directory.

Undo & HistoryDestructive

How to Discard All Local Changes in Git

Discard all unstaged and uncommitted file modifications and restore your working tree to the latest commit.

Branches & TagsSafe

How to Rename a Local and Remote Git Branch

Rename your current local branch and update the upstream remote tracking branch on GitHub or GitLab.

Branches & TagsReversible

How to Delete a Remote Branch in Git

Delete a branch from remote origin (GitHub, GitLab, Bitbucket) after a pull request has been merged.

Undo & HistorySafe

How to Change the Most Recent Git Commit Message

Amend the commit message of your latest commit before or after pushing.

Undo & HistorySafe

How to Unstage Files from Git (Undo git add)

Remove files from the Git staging area (index) without losing any of your local changes.