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
:
<!doctype html> | |
<!-- Adapted from https://gist.github.com/tfausak/2222823 --> | |
<html> | |
<head> | |
<title>Mobile-ready web app</title> | |
<!-- CONFIGURATION --> |