From be6c69e29ff625585d6b8e10d8a36f4483a0145f Mon Sep 17 00:00:00 2001 From: Philipp Spiess Date: Tue, 15 Oct 2024 17:47:24 +0200 Subject: [PATCH] Remove .gitattributes file (#14676) I added the `.gitattributes` a while back because I thought it would help us make it simpler when rebasing changes to the `CHANGELOG.md` file. However, I don't think this is actually true. Now, instead of a merge conflict, the rebase just ends up duplicating a lot of lines which we only see when we review the PR on GitHub later which is really annoying. So, for now, let's remove it again. Ideally we can have a better merge strategy here (or potentially other tools). --- .gitattributes | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index a19ade077..000000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -CHANGELOG.md merge=union