The repo is currently archived but the package is not. This package is distinct from the built-in merge conflict resolution that npm does automatically in npm. npm-merge-driver is a standalone shell script intended to be set in one's git config to help automatically resolve conflicts at the git level.
The repo doesn't have meaningful tests, and would need a bit of work to be up to the line of "supported". It probably should eventually be supported as it is a useful tool that folks do use. It should, however, also be prioritized appropriately.
The repo is currently archived but the package is not. This package is distinct from the built-in merge conflict resolution that npm does automatically in npm.
npm-merge-driveris a standalone shell script intended to be set in one'sgit configto help automatically resolve conflicts at the git level.The repo doesn't have meaningful tests, and would need a bit of work to be up to the line of "supported". It probably should eventually be supported as it is a useful tool that folks do use. It should, however, also be prioritized appropriately.