Prevent Git from auto-merging Composer's lockfile

Source: https://blog.martinhujer.cz/17-tips-for-using-composer-efficiently/
7 years ago · 995a2621db
parent 01e5fde09c
commit 995a2621db
1 changed files with 2 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,3 +1,5 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .gitmodules export-ignore
+
+composer.lock -merge