search

balbuf / composer-git-merge-driver

Custom git merge driver to minimize merge conflicts in composer.json and composer.lock files
124 stars 7 forks source link

Invoke composer validate after merge driver completed #14

Open staabm opened 5 years ago

staabm commented 5 years ago

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 trailing comma on the preceding property. Care should be taken to verify the syntax of the overall file and manually update accordingly.

Would it be possible that the merge driver automatically invokes composer validate after a merge to make sure (and the user aware) if the generated files contain a syntax error after merge (so we dont need to manually be aware of this edge case)?

balbuf commented 4 years ago

The merge driver itself would be inappropriate for this purpose, since it has already been fully executed by the time the user is manually fixing merge conflicts and where this edge case would occur. Instead, this would be best performed in a pre-commit hook or some other appropriate git hook. I think it would be in the scope of this project, if you or anyone else would like to propose a sample git hook to include in the repo which can be manually installed just like the driver itself.