Git merge binary files

# Use the remote version
git checkout --theirs -- path/to/conflicted-file.txt

# Keep your local version
git checkout --ours -- path/to/conflicted-file.txt

Source: stackoverflow.com

Similar codes

0 vote154 views1 answer
Gitlab add remote upstream
Shell/Bash
82 votes159 views6 answers
Git revert a commit
Shell/Bash
52 votes171 views1 answer
Get linux OS info from os-release
Shell/Bash
0 vote154 views2 answers
How to mount a hard drive in ubuntu
Shell/Bash
1 vote144 views1 answer
"git reset –- soft head^"
Shell/Bash
0 vote159 views1 answer
Install mongodb on vps
Shell/Bash
3 votes146 views1 answer
Brew upgrade except
Shell/Bash
1 vote150 views1 answer
Ubuntu install codecs
Shell/Bash
1 vote148 views1 answer
How to add application to unity launcher
Shell/Bash
0 vote186 views3 answers
Package 'docker-ce' is not installed, so not removed
Shell/Bash