Seems like I'm facing a problem that was encountered quite a few times
already but I have a problem telling Git how to behave with binary
My objective is rather simple: overwrite the binary files during a "git pull".
What I've done:
I've created a .gitattributes with "*.sdf -binary" in my project's
base directory, like this:
When I pull changes from a remote repo, there are conflicts found for,
say, "foo/zap.sdf" file. But when I "git diff foo/zap.sdf", Git tells
me it's a binary file and no diff is being shown, which is a sign I've
partially set my .gitattributes file correctly.
I've previously tried "git pull -s recursive -X theirs" but that's not
what I wanted.
I ended up selecting the file in the following manner:
$ git checkout remotes/origin/myBranch -- foo/zap.sdf
But I don't want to do that all the time.
How can I tell Git to overwrite any binary (*.sdf and eventually other
files) that I pull from the remote repo?
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to email@example.com.
To unsubscribe from this group, send email to
For more options, visit this group at