You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Question: How to prevent merge conflicts when Pull Requests each have changed the CHANGELOG.md file?
Simply set the merge strategy to union by adding a .gitattributes file with this command: echo CHANGELOG.md merge=union >> .gitattributes
The union merge strategy is most appropriate for files where merge conflicts are often trivial and can be auto-resolved by simply taking all changes. It's less suitable for files where the order of lines or the exact content is crucial, as it could result in incorrect or duplicate entries.
This discussion was converted from issue #584 on November 08, 2023 07:53.
Heading
Bold
Italic
Quote
Code
Link
Numbered list
Unordered list
Task list
Attach files
Mention
Reference
Menu
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
-
I'm suggesting this addition to the FAQ:
Question: How to prevent merge conflicts when Pull Requests each have changed the
CHANGELOG.md
file?Beta Was this translation helpful? Give feedback.
All reactions