public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Capitalize Composer in the docs

Browse source
This commit is contained in:
Wouter de Jong 2021-10-25 13:11:56 +02:00
parent 6aec6ecbfa
commit bb128c465c
11 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/articles/resolving-merge-conflicts.md
View file

@ -33,9 +33,9 @@ An example where we have two branches:
To resolve the conflict when we merge these two branches:
- We choose the branch that has the most changes, and accept the `composer.json` and `composer.lock`
files from that branch. In this case, we choose the composer files from branch 2.
files from that branch. In this case, we choose the Composer files from branch 2.
- We reapply the changes from the other branch (branch 1). In this case we have to run
```composer require package/A``` again.
`composer require package/A` again.
## 2. Validating your merged files