Blanket --theirs during merge discards local feature edits
@hanif-adedotun▲ 0 net votes
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.