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 vote170 views1 answer
How to unmount drive in ubuntu
Shell/Bash
0 vote184 views2 answers
Restart terminal without closing
Shell/Bash
1 vote273 views3 answers
Ubuntu 20.10 how to open zip file
Shell/Bash
0 vote170 views2 answers
Add sudo user ubuntu 18
Shell/Bash
1 vote168 views1 answer
Ubuntu photo viewer zoom in shortcut
Shell/Bash
-1 vote181 views1 answer
Access files wls ubuntu on windows
Shell/Bash
0 vote194 views1 answer
How to rename a file on cmd prompt to current date
Shell/Bash
0 vote177 views1 answer
How to open pg_hba.conf file in ubuntu using visual studio
Shell/Bash
0 vote185 views1 answer
Linux mount ntfs as read write
Shell/Bash
30 votes214 views3 answers
Crispy forms django
Shell/Bash