composer-git-merge-driver
composer-git-merge-driver copied to clipboard
balbuf
Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
I'm getting an error on merge: ``` Auto-merging composer.lock CONFLICT (content): Merge conflict in composer.lock Auto-merging composer.json Automatic merge failed; fix conflicts and then commit the result. ``` I am...
I have tab indent formatted composer.json, each time composer-git-merge-driver is merging, the formatting is replaced with space indent.
my standard disclaimer: Don't link to branches! - see https://news.ycombinator.com/item?id=8046710 and https://help.github.com/articles/getting-permanent-links-to-files/ - hit `y` - and perhaps https://github.com/josephfrazier/octopermalinker
The readme mentions > When a merge conflict occurs where the last property of an object is removed, accepting the removed version will result in invalid syntax due to a...
Check for our special message and regenerate the hash as necessary - this would be an optional hook to add, of course.
Formatting changes we can live with, but we should switch from array to object parsing (i.e. the default) so we can preserve empty objects; this would also eliminate the need...