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 vote269 views1 answer
How to open fileexplorer from terminal in ubuntu
Shell/Bash
0 vote264 views1 answer
Jenkins download
Shell/Bash
4 votes286 views2 answers
Missing essential plugin: org.jetbrains.android
Shell/Bash
0 vote295 views1 answer
Powershell create file and directory
Shell/Bash
3 votes268 views1 answer
How to restart docker linux
Shell/Bash
0 vote278 views1 answer
Solidity optimizer runs
Shell/Bash
18 votes283 views6 answers
Check disk space linux
Shell/Bash
1 vote267 views1 answer
Bash parameter count
Shell/Bash
0 vote406 views1 answer
Login as super user
Shell/Bash
2 votes289 views1 answer
Linux search for previous commands
Shell/Bash