GitHub topics: git-merger
balbuf/composer-git-merge-driver
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
Language: PHP - Size: 23.4 KB - Last synced at: 26 days ago - Pushed at: over 2 years ago - Stars: 130 - Forks: 7
shaharkazaz/vscode-git-merger
Available at vscode marketplace https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger
Language: TypeScript - Size: 185 KB - Last synced at: 3 months ago - Pushed at: about 7 years ago - Stars: 24 - Forks: 2
