2 results found Sort:

Learn why conflicts happen and how to resolve them.
Created 2022-01-24
39 commits to main branch, last one 8 months ago
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
Created 2018-02-21
22 commits to master branch, last one 4 years ago