chtnnh chtnnh

## package-lock-conflicts.md

      
              1 file
            
          
              11 forks
            
          
              11 comments
            
          
              29 stars
            
          
                szemate
                / package-lock-conflicts.md
            
            
              Last active
              May 29, 2024 04:04
            
              
                How to resolve package-lock.json conflicts
              
          
    How to resolve package-lock.json conflicts

It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.

Update the master branch with the latest changes:
git checkout master
git pull


Merge your feature branch into master: