szemate

How to resolve package-lock.json conflicts

Important

The following guide has been created for coding bootcamp participants who are new to Git and NPM and not comfortable with CLI tools. Not intended for professional developers.

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

1. Update the master branch with the latest changes:

   git checkout master
   

khalidahmada

/*
   * Add the MailHog to your wordpress projects
   * By Khalid Ahmada
   * MailHog @see https://github.com/mailhog/MailHog
   */

  class WP_MAILHOG
  {

    function __construct()