mirror of
https://github.com/rapidsai/cudf.git
synced 2021-11-08 00:24:56 +03:00
reduce CHANGELOG.md merge conflicts
This should reduce our frequent merge conflicts in PRs in CHANGELOG.md. https://about.gitlab.com/blog/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/#update
This commit is contained in:
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -1 +1,2 @@
|
||||
python/cudf/cudf/_version.py export-subst
|
||||
CHANGELOG.md merge=union
|
||||
|
||||
Reference in New Issue
Block a user