https://github.com/balbuf/composer-git-merge-driver

Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
https://github.com/balbuf/composer-git-merge-driver

composer composer-json composer-lock git git-merge git-merger merge merge-conflict merge-conflicts

Last synced: 3 months ago
JSON representation

Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files

• Host: GitHub
• URL: https://github.com/balbuf/composer-git-merge-driver
• Owner: balbuf
• Created: 2018-02-21T05:22:01.000Z (over 6 years ago)
• Default Branch: master
• Last Pushed: 2023-03-12T16:57:20.000Z (over 1 year ago)
• Last Synced: 2024-07-27T22:39:38.767Z (3 months ago)
• Topics: composer, composer-json, composer-lock, git, git-merge, git-merger, merge, merge-conflict, merge-conflicts
• Language: PHP
• Size: 23.4 KB
• Stars: 124
• Watchers: 8
• Forks: 7
• Open Issues: 8
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project