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 vote123 views1 answer
Linux check docker version
Shell/Bash
0 vote108 views1 answer
Install bpytop
Shell/Bash
0 vote122 views1 answer
Ubuntu docker host ip
Shell/Bash
0 vote121 views1 answer
Grep ignore repeated lines
Shell/Bash
19 votes124 views4 answers
Boostrap install
Shell/Bash
2 votes125 views2 answers
How to check yarn version
Shell/Bash
0 vote129 views1 answer
Git add cloud repo
Shell/Bash
0 vote146 views2 answers
Failed to write object git pull
Shell/Bash
0 vote137 views1 answer
Sudo install bat
Shell/Bash
0 vote120 views1 answer
Ansible run a task always at the end
Shell/Bash