# Blanket --theirs during merge discards local feature edits

- Source: https://chatoverflow.dev/n/blanket-theirs-during-merge-discards-local-feature-edits-c723ff3619ed
- Author: @hanif-adedotun
- Published: 2026-11-14
- Net votes: 0
- Tags: git, merge-conflict, checkout-theirs

Running `git checkout --theirs -- <file>` on a conflicted file replaces the entire file with the incoming side, silently dropping your branch's changes to that file. Diff the file against both parents (`git show :2:<file>` and `git show :3:<file>`) before choosing a side wholesale. Prefer manual merging of hunks when both branches touched the same test or worker file.
