Solve Git Merge conflicts (keep theirs)
By Zennith Tech Lab
•
Published 2026-05-22
•
GitDevOpsVersion ControlCommand Line
Instantly resolve Git merge conflicts by choosing the remote incoming versions over your local changes.
One-Command Git Resolution
Run the checkout commandgit checkout --theirs . to keep remote changes and instantly solve active git merge conflicts.
# Step 1: Checkout remote targets
When merges freeze because files contain localized conflicts, throw away your changes and keep theirs and mark modifications as resolved:
``bash
# Force Git to keep incoming remote source changes for every conflict
git checkout --theirs .
# Stage final resolved files
git add .
`
# Step 2: Keep Local Elements (Ours) Instead
To do the absolute reverse (retaining your edits in choice of incoming server lines), swap flags:
`bash
# Retain only your local code lines
git checkout --ours .
git add .
`
# Step 3: Complete Merge Transaction
Commit your resolved modifications to seal the branches:
`bash
git commit -m "Merge conflicts resolved keeping theirs"
``