Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[task] Figure out what to do with npm-merge-driver #854

Open
wraithgar opened this issue May 20, 2024 · 0 comments
Open

[task] Figure out what to do with npm-merge-driver #854

wraithgar opened this issue May 20, 2024 · 0 comments

Comments

@wraithgar
Copy link
Member

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant