I have been using custom merge rules based on an answer I found on
stackoverflow a while back, in order to merge certain filetypes
automatically. This has worked well, however I now find myself using
`git rebase` at least as frequently as I do `git merge`, and when I do
so it appears these merge rules are not being followed -- I am asked to
resolve merges in filetypes set in my .gitattributes file manually.
Is there a way to make `git rebase` follow the merge strategy defined in
my .gitattributes file? I have looked in the documentation for "git
rebase" and "gitattributes" but didn't notice anything relating
specifically to this issue -- perhaps I missed it. If anyone could help
point me in the right direction it would be most appreciated.
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 firstname.lastname@example.org.
To unsubscribe from this group, send email to
For more options, visit this group at