Skip to content

Automatically combine concurrent changes to CHANGELOG.md in two open PRs #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivorbosloper wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −0
Open

Automatically combine concurrent changes to CHANGELOG.md in two open PRs #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Combine concurrent changes to CHANGELOG.md instead of conflicting. When two PRs both append
# entries under "## [Unreleased]", git's built-in "union" driver keeps both
# sets of added lines rather than reporting a merge conflict.
CHANGELOG.md merge=union
Loading