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:
Aissa BOUGUERN aissa-bouguern
szemate
/ package-lock-conflicts.md
Last active
May 5, 2025 07:32
How to resolve package-lock.json conflicts
khalidahmada
/ wp-mailhog-config-smtp.php
Created
August 10, 2018 11:14
Config Wordpress SMTP for MailHog - test your emails local
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| /* | |
| * Add the MailHog to your wordpress projects | |
| * By Khalid Ahmada | |
| * MailHog @see https://github.com/mailhog/MailHog | |
| */ | |
| class WP_MAILHOG | |
| { | |
| function __construct() |