# Use this commands after a git merge conflict, if you can't
# (or don't want to) fix the conflicts on some files.
# To use the base branch's file, use this:
git checkout --ours -- path/to/your/file.ext
git add path/to/file.ext
# To use the compare branch's file, use this:
git checkout --theirs -- path/to/your/file.ext
git add path/to/file.ext
# For example:
git checkout --theirs -- spec/fixtures/example.docx
git add spec/fixtures/example.docx