diff options
| author | Christian Duerr <contact@christianduerr.com> | 2020-02-15 10:25:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-15 13:25:02 +0300 |
| commit | a842d6827c74108156f0f21e34ff93c2a7a349fb (patch) | |
| tree | 8a75e671be0ff76bac2dc2fcc6786e65d02819bc | |
| parent | 988a846c52f381bdd2d211d9dbb4b9bf0f9105e5 (diff) | |
Add custom merge strategy for CHANGELOG.md
The merge strategy `union` should hopefully reduce the number of
conflicts when trying to rebase the configuration file, since most of
the changes are simple additions anyways.
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..3d432e03 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/CHANGELOG.md merge=union |