git fusionner les fichiers binaires
# Use the remote version
git checkout --theirs -- path/to/conflicted-file.txt
# Keep your local version
git checkout --ours -- path/to/conflicted-file.txt
Muddy Moose