public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Hint at improved merge conflict resolving (#10840)

pull/10893/head
immeëmosol 2022-06-22 13:47:15 +02:00 committed by GitHub
parent d132b9e6fd
commit bbcadcb35e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/articles/resolving-merge-conflicts.md
View File

@ -47,6 +47,12 @@ php composer.phar validate
php composer.phar install [--dry-run]
```
## Automating merge conflict resolving with git
Some improvement _could_ be made to git's conflict resolving by using a custom git merge driver.
An example of this can be found at [balbuf's composer git merge driver](https://github.com/balbuf/composer-git-merge-driver).
## Important considerations
Keep in mind that whenever merge conflicts occur on the lock file, the information, about the exact version