balbuf/composer-git-merge-driver
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
PHP
Issues
- 1
How to debug merge driver when it fails?
#15 opened by k0pernikus - 2
Add support to preserve formatting (preserve tabs)
#13 opened by glensc - 1
- 5
- 0
Adopt and implement an official coding standard
#10 opened by balbuf - 0
Add unit tests
#9 opened by balbuf - 2
- 0
Empty object is replaced by empty array
#2 opened by balbuf - 1