Merge .gitignore across branches