diff options
| author | Gabriel Scherer <gabriel.scherer@gmail.com> | 2017-08-09 13:58:40 +0200 |
|---|---|---|
| committer | Mark Shinwell <mshinwell@gmail.com> | 2017-08-09 12:58:40 +0100 |
| commit | c62546fcdf6c4a20b6f6d66b1bbed26041747f5b (patch) | |
| tree | 59e940b08ca69ad22d9135b7a39f002c8f258419 /.gitattributes | |
| parent | 110b1c24de32fbfbee90f3ee392bc1b610de53f5 (diff) | |
| download | ocaml-c62546fcdf6c4a20b6f6d66b1bbed26041747f5b.tar.gz | |
.gitattributes: disable the 'union' merge driver for Changes (#1277)
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index f4bdc362e6..da3b3e07e5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -27,7 +27,12 @@ # 'union' merge driver just unions textual content in case of conflict # http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/ /.mailmap merge=union -/Changes merge=union + + +# We tried using 'union' for Changes and it did not work: +# instead of creating Changes conflict it would silently duplicate +# the lines involved in the conflict, which is arguably worse +#/Changes merge=union # No header for text files (would be too obtrusive). *.md ocaml-typo=missing-header |