github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Prevent Git from auto-merging Composer's lockfile 

Source: https://blog.martinhujer.cz/17-tips-for-using-composer-efficiently/
pull/53/head
Franz Liedke 7 years ago
parent
01e5fde09c
commit
995a2621db
No known key found for this signature in database
GPG Key ID: 9A0231A879B055F4
1 changed files with 2 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitattributes

2
.gitattributes vendored
Unescape View File

@ -1,3 +1,5 @@
.gitattributes export-ignore .gitattributes export-ignore
.gitignore export-ignore .gitignore export-ignore
.gitmodules export-ignore .gitmodules export-ignore
composer.lock -merge

Write Preview
Loading…
Cancel
Save