merge-conflict topic

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

balbuf

Learn why conflicts happen and how to resolve them.

skills