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
:
/* | |
* Add the MailHog to your wordpress projects | |
* By Khalid Ahmada | |
* MailHog @see https://github.com/mailhog/MailHog | |
*/ | |
class WP_MAILHOG | |
{ | |
function __construct() |