diff options
| author | Christian Duerr <contact@christianduerr.com> | 2021-08-27 22:11:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 22:11:20 +0000 |
| commit | cf35a2019162c6055e4a4c152976a424ba10869d (patch) | |
| tree | 059e50fbdba7b003c26584ef2a3ed2677c6a621e | |
| parent | 70d3b4ef6cc53df74e03467258766fa8319e13a1 (diff) | |
| download | alacritty-cf35a2019162c6055e4a4c152976a424ba10869d.tar.gz alacritty-cf35a2019162c6055e4a4c152976a424ba10869d.zip | |
Remove custom merge strategy for changelog
While the custom merge strategy can make things simpler in some
scenarios, it has repeatedly shown to silently introduce errors that
have to be manually spotted and corrected after the fact.
It's much more reliable and efficient to always manually oversee
potential conflicts, rather than letting them slip through half of the
time and having to contribute follow-up patches.
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 3d432e03..00000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -/CHANGELOG.md merge=union |