Fixing merge conflicts in Git
From CoolAJ86's answer on StackOverflow:
git checkout --ours filename.c
git checkout --theirs filename.c
git add filename.c
git commit -m "using theirs"
- Next: Undo last commit in Git
- Previous: Minecraft server and IPv6