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

14 votes278 views6 answers
How to untrack files in git
Shell/Bash
0 vote271 views1 answer
Linux send process to background and close terminal
Shell/Bash
0 vote278 views2 answers
Gui for ubuntu server
Shell/Bash
0 vote265 views1 answer
Could not resolve dependency: peer @angular/common@"^8.0.0" from @ng-bootstrap/[email protected]
Shell/Bash
-2 votes262 views1 answer
Update gitcmd
Shell/Bash
2 votes261 views1 answer
How to replace a string in multiple files in linux command line
Shell/Bash
0 vote268 views3 answers
React native setup ubuntu 20.04
Shell/Bash
0 vote257 views1 answer
How to change or remove ubuntu logo in login page
Shell/Bash
26 votes266 views5 answers
Install vlc on ubuntu
Shell/Bash
0 vote257 views1 answer
Ssh file transfer putty
Shell/Bash