Git · Senior · Question 61 of 76
What does a custom merge driver in .gitattributes allow?
- 1Merging only on weekdays during work hours
- 2Running tests before every merge commit
- ✓Correct answer: Merging a file type with your own tool or rule
Explanation
For example CHANGELOG.md merge=union keeps lines from both sides, avoiding conflicts on append-only files. The driver must also be configured in Git config.