Skip to content

Commit 45d2f40

Browse files
committed
Mark generated files as generated
Being prompted to manually merge conflicts in generated files is very annoying, and also wrong - the correct thing to do is re-run the generator script and get fresh output after each change
1 parent 29868d4 commit 45d2f40

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/.gitattributes export-ignore
22
/.github export-ignore
33
/.gitignore export-ignore
4-
/.travis.yml.old export-ignore
54
/CONTRIBUTING.md export-ignore
65
/docker-compose.yml export-ignore
76
/generator export-ignore
@@ -10,3 +9,4 @@
109
/phpstan.neon export-ignore
1110
/phpunit.xml.dist export-ignore
1211
/tests export-ignore
12+
/generated/**/*.php -merge linguist-generated=true

0 commit comments

Comments
 (0)