aboutsummaryrefslogtreecommitdiffhomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-01-20 18:49:45 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-20 18:49:45 +0100
commit173629a4002de5091f41cad4891cca6c8490a7ca (patch)
tree914c7184d511b4e70d9d6b8f9dea2b406ba67f0f /.gitignore
parentd481f42b7d383eb6211d1d3049d1a2c8288d9edb (diff)
downloadwallabag-173629a4002de5091f41cad4891cca6c8490a7ca.tar.gz
wallabag-173629a4002de5091f41cad4891cca6c8490a7ca.tar.zst
wallabag-173629a4002de5091f41cad4891cca6c8490a7ca.zip
Ignore composer.lock
Having a big composer.lock on a final project can have side effect on incoming PR that add a new vendor. Mostly because conflict are too frequent. By ignoring composer.lock we ease the PR submission and rebase. BUT we need to be careful when we release a new version of wallabag. We should manually `git add -f composer.lock` to update it. Since composer.lock will no longer be commited I switch the `composer install` to a `composer up` in the travis configuration.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b6d6aa5d..02e921f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,6 @@ data/db/wallabag*.sqlite
35# Docker container logs and data 35# Docker container logs and data
36docker/logs/ 36docker/logs/
37docker/data/ 37docker/data/
38
39# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
40composer.lock