wikiti
10/8/2018 - 9:59 AM

Resolve git binary conflict

Resolve a binary conflict when performing merges. Of course, this works too for plain text files.

bash.sh
content_copyfile_download
# 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