diff options
author | Bozhidar Batsov <bozhidar@batsov.com> | 2016-10-20 17:57:39 +0200 |
---|---|---|
committer | Bozhidar Batsov <bozhidar@batsov.com> | 2016-10-20 17:57:39 +0200 |
commit | 3be082ae4a3d0b40d360648b20fb7caa14c0a9fc (patch) | |
tree | f17edc2d19dbeace04de7e67604273751f3c0f43 | |
parent | 0803409db2957c2ad1131deaa7004b8eb35d0bb9 (diff) |
Make it easier to deal with changelog conflicts
See
https://medium.com/@nettsundere/on-reducing-changelog-merge-conflicts-1eb23552630b#.dcl1qlj7d
for details.
-rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..a19ade07 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union |