Merge pull request #2022 from webfactory/issue-2022

"conflict" does not work for non-trivial constraints

doc/04-schema.md

@@ -309,6 +309,11 @@ if `install` is run with `--dev` or if `update` is run without `--no-dev`.
 Lists packages that conflict with this version of this package. They
 will not be allowed to be installed together with your package.
 
+Note that when specifying ranges like "<1.0, >= 1.1" in a `conflict` link,
+this will state a conflict with all versions that are less than 1.0 *and* equal
+or newer than 1.1 at the same time, which is probably not what you want. You
+probably want to go for "<1.0 | >= 1.1" in this case.
+
 #### replace
 
 Lists packages that are replaced by this package. This allows you to fork a