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.

Sign up for GitHub

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

Jump to bottom

chore: use npm as a merge tool #370

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: use npm as a merge tool #370

wants to merge 1 commit into from

Commits on Apr 20, 2023

  1. chore: try to configure "npm install" as a merge tool to resolve pack… 

    …age-lock.json conflicts
    @boneskull
    boneskull committed Apr 20, 2023
    Configuration menu
    Copy the full SHA
    2aca82c View commit details
    Browse the repository at this point in the history