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 
masterbranch with the latest changes:git checkout master git pull - Merge your feature branch into 
master: 
| #!/bin/sh | |
| #https://github.com/PythonicNinja/jetbrains-reset-trial-mac-osx/blob/master/runme.sh | |
| for product in IntelliJIdea WebStorm DataGrip PhpStorm CLion PyCharm GoLand RubyMine Rider; do | |
| echo "Closing $product" | |
| ps aux | grep -i MacOs/$product | cut -d " " -f 5 | xargs kill -9 | |
| echo "Resetting trial period for $product" | 
| #!/bin/bash | |
| # reset jetbrains ide evals v1.0.4 | |
| OS_NAME=$(uname -s) | |
| JB_PRODUCTS="IntelliJIdea CLion PhpStorm GoLand PyCharm WebStorm Rider DataGrip RubyMine AppCode" | |
| if [ "$OS_NAME" == "Darwin" ]; then | |
| echo 'macOS:' | |
| for PRD in $JB_PRODUCTS; do | 
| // Returns an array of dates between the two dates | |
| var getDates = function(startDate, endDate) { | |
| var dates = [], | |
| currentDate = startDate, | |
| addDays = function(days) { | |
| var date = new Date(this.valueOf()); | |
| date.setDate(date.getDate() + days); | |
| return date; | |
| }; | |
| while (currentDate <= endDate) { |