PhpDev.App

Repositories on Topic: merge-conflict

You can also look up for these other topics:
Framework Coding Standards Boilerplate CMS Tool Security Hacktoberfest

balbuf/composer-git-merge-driver

Composer Git Merge Driver

Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files

blog balbuf
7 112 7