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 vote189 views4 answers
Why i am not able to paste anything in htdocs folder in ubuntu
Shell/Bash
0 vote175 views1 answer
Arch linux create windows bootable usb
Shell/Bash
-1 vote166 views2 answers
Kubernetes while true sleep
Shell/Bash
0 vote204 views1 answer
Auto hide taskbar on a gnome
Shell/Bash
4 votes164 views1 answer
Pm2 adonisjs
Shell/Bash
0 vote167 views1 answer
Vim move terminal down
Shell/Bash
0 vote158 views1 answer
"gcc": executable file not found in $PATH
Shell/Bash
0 vote174 views1 answer
How to active telnet on windows 10 telnet
Shell/Bash
154 votes181 views6 answers
Linux kali
Shell/Bash
63 votes169 views4 answers
How to install vue
Shell/Bash