From 945adcf172d3c0bfba357e3ca6160104eacac46c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 20 Jul 2018 11:38:49 +0200 Subject: [PATCH] Fix doc ambiguity, fixes #7471 --- doc/01-basic-usage.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/01-basic-usage.md b/doc/01-basic-usage.md index 9c57f3e92..08e096735 100644 --- a/doc/01-basic-usage.md +++ b/doc/01-basic-usage.md @@ -154,8 +154,10 @@ and running `install` again.) ```sh php composer.phar update ``` + > **Note:** Composer will display a Warning when executing an `install` command -> if `composer.lock` and `composer.json` are not synchronized. +> if the `composer.lock` has not been updated since changes were made to the +> `composer.json` that might affect dependency resolution. If you only want to install or update one dependency, you can whitelist them: