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

5 votes303 views6 answers
Git Rebase
Shell/Bash
0 vote289 views1 answer
Install pug
Shell/Bash
2 votes279 views4 answers
How to kill process ubuntu
Shell/Bash
8 votes315 views3 answers
Error: requires babel "^7.0.0-0", but was loaded with "6.26.3".
Shell/Bash
-1 vote297 views1 answer
Ver ayuda de comandos en linux
Shell/Bash
0 vote237 views1 answer
Plesk show mailqueue
Shell/Bash
0 vote315 views1 answer
Npm install capacitor to existing angular project
Shell/Bash
0 vote304 views1 answer
How to show which kerne version is intalled on the system linux
Shell/Bash
5 votes292 views1 answer
Git branch origin list
Shell/Bash
46 votes290 views6 answers
Terminal unzip
Shell/Bash