Eric Parent <[email protected]> writes: Hi Eric,
> 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 > files. > > 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: > > myProj/ > .gitattributes > foo > bar > (etc.) > > When I pull changes from a remote repo, there are conflicts found for, > say, "foo/zap.sdf" file. I'm not completely sure, but I think the glob patterns match relative to the location of the .gitignore/.gitattributes files they are specified in. So in your case "*.sdf" matches only sdf-files directly located in myProj/ but not in subfolders. To match all sdf-files contained in your project, "**/*.sdf" should do the trick. Bye, Tassilo -- 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 protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
