When I cherry-pick some commit that has conflicts with package-lock.json file, the npm-merge-drive run
when it failed the cherry-pick fails, how can I remove it?
You can run the following command:
git config --global --remove-section merge.npm-merge-driver
this will remove it...