Apply merge rules from .gitattributes file to git rebase calls

Question

I have previously read and applied the instructions from this excellent answer about setting up merge strategies for specific file types in git. This works superbly for merges. However, when I do a git rebase, the merge strategy isn't applied.

Is it possible to set git rebase up so that it applies a similar merge strategy to resolve certain conflicts automatically?

Answer 1

You can force rebase to apply the same rules for renamed files (cause problems too) as with a merge

 git rebase --merge

It might also work for your problem. It does not work when you want to apply eol conversion while rebasing.