Skip to content

Commit

Permalink
Word wrap README
Browse files Browse the repository at this point in the history
  • Loading branch information
bd808 committed Apr 25, 2017
1 parent 1bc876a commit 81c6ac7
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions README.md
Expand Up @@ -24,7 +24,8 @@ extensions which may be managed via Composer.
Installation
------------

Composer Merge Plugin requires [Composer 1.0.0](https://getcomposer.org/) or newer.
Composer Merge Plugin requires [Composer 1.0.0](https://getcomposer.org/) or
newer.

```
$ composer require wikimedia/composer-merge-plugin
Expand Down Expand Up @@ -121,9 +122,17 @@ made by earlier files. Files are loaded in the order specified by the

### ignore-duplicates

By default, Composer's conflict resolution engine is used to determine which version of a package should be installed when multiple files specify the same package. An `"ignore-duplicates": true` setting can be provided to change to a "first version specified wins" conflict resolution strategy. In this mode, duplicate package declarations found in merged files will be ignored in favor of the declarations made by earlier files. Files are loaded in the order specified by the `include` setting with globbed files being processed in alphabetical order.
By default, Composer's conflict resolution engine is used to determine which
version of a package should be installed when multiple files specify the same
package. An `"ignore-duplicates": true` setting can be provided to change to
a "first version specified wins" conflict resolution strategy. In this mode,
duplicate package declarations found in merged files will be ignored in favor
of the declarations made by earlier files. Files are loaded in the order
specified by the `include` setting with globbed files being processed in
alphabetical order.

Note: `"replace": true` and `"ignore-duplicates": true` modes are mutually exclusive. If both are set, `"ignore-duplicates": true` will be used.
Note: `"replace": true` and `"ignore-duplicates": true` modes are mutually
exclusive. If both are set, `"ignore-duplicates": true` will be used.

### merge-dev

Expand Down Expand Up @@ -196,8 +205,8 @@ GitHub as well.
License
-------

Composer Merge plugin is licensed under the MIT license. See the [`LICENSE`](LICENSE)
file for more details.
Composer Merge plugin is licensed under the MIT license. See the
[`LICENSE`](LICENSE) file for more details.


---
Expand Down

0 comments on commit 81c6ac7

Please sign in to comment.