3 results found Sort:
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
Github 1️⃣0️⃣1️⃣
Created
2023-07-27
212 commits to main branch, last one 8 months ago
VS Code extension providing diff editor layouts & more for 3-way merging
Created
2020-08-26
302 commits to main branch, last one 3 years ago