Add merge strategy for .gitignore

Always use .gitignore on the current branch when merging.