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 vote225 views2 answers
Get total github lines
Shell/Bash
0 vote287 views1 answer
Docker fatal: Not a git repository (or any of the parent directories): .git
Shell/Bash
0 vote271 views1 answer
Install cp in windows cmd
Shell/Bash
0 vote269 views2 answers
Cronjob run every hour
Shell/Bash
2 votes266 views1 answer
M1 install gradle
Shell/Bash
0 vote256 views1 answer
Linux create folder with date
Shell/Bash
0 vote238 views1 answer
Unistall all homebrew packages
Shell/Bash
0 vote278 views1 answer
Mover archivos linux ssh
Shell/Bash
0 vote246 views2 answers
How to delete dangling docker images
Shell/Bash
23 votes270 views6 answers
Git remove Untracked files
Shell/Bash