diff options
| author | Andreas Rogge <andreas.rogge@bareos.com> | 2022-02-03 12:43:38 +0300 |
|---|---|---|
| committer | Philipp Storz <philipp.storz@bareos.com> | 2022-02-04 13:51:32 +0300 |
| commit | ce37e8493ef9a2259c1d0533d927ef98dd3794ae (patch) | |
| tree | 7485b7d56d4b3b17f279a26bccc76a0569acf197 /.gitattributes | |
| parent | 746e7a10df17e9f2f2dc3c30b49c0b69e9cc9c95 (diff) | |
set merge strategy for CHANGELOG.md to union
This patch adds a .gitattributes file that will configure the merge
strategy for CHANGELOG.md to union. This will make sure conflict
resolution will simply keep all lines added.
This may produce bogus merges, but will usually do the right thing. As
always, make sure to review your files after a merge.
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..a19ade077 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +CHANGELOG.md merge=union |