2 results found Sort:

skills
resolve-merge-conflicts skills
97
128
mit
10
Learn why conflicts happen and how to resolve them.
git github skills-course merge-conflict merge-conflicts
Created 2022-01-24
39 commits to main branch, last one 3 months ago
balbuf
composer-git-merge-driver balbuf
7
123
unknown
8
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
git merge composer git-merge git-merger composer-json composer-lock merge-conflict merge-conflicts
Created 2018-02-21
22 commits to master branch, last one 4 years ago