Amir H. Moayeri AsbDaryaee

## package-lock-conflicts.md

      
              1 file
            
          
              11 forks
            
          
              12 comments
            
          
              30 stars
            
          
                szemate
                / package-lock-conflicts.md
            
            
              Last active
              June 13, 2024 15:11
            
              
                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:


## _mobile-ready-web-app.html
<!doctype html>

<!-- Adapted from https://gist.github.com/tfausak/2222823 -->

<html>
  <head>
    <title>Mobile-ready web app</title>

    <!-- CONFIGURATION -->
	<!doctype html>

	<!-- Adapted from https://gist.github.com/tfausak/2222823 -->

	<html>
	<head>
	<title>Mobile-ready web app</title>

	<!-- CONFIGURATION -->