Remove .gitattributes file (#14676)

0 Fork 0

mirror of https://github.com/aphrody-labs/tailwindcss.git synced 2026-10-17 12:45:52 +00:00

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).

This commit is contained in:

Philipp Spiess authored and

GitHub committed 2024-10-15 17:47:24 +02:00

1 parent e2109a3b92

commit be6c69e29f

1 file changed

-1

.gitattributes

-1

View File

				`@@ -1 +0,0 @@`
				`CHANGELOG.md merge=union`