git-merger
There are 2 repositories under git-merger topic.
balbuf/composer-git-merge-driver
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
shaharkazaz/vscode-git-merger
Available at vscode marketplace https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger