Updating fd160f7..3d96171
error: Your local changes to the following files would be overwritten by merge:
composer.lock
database/seeders/CreateAdminUserSeeder.php
package-lock.json
Please commit your changes or stash them before you merge.
Aborting
When I attempt to run git pull
, I receive the above error because these files have been modified locally.
New contributor
user26584989 is a new contributor to this site. Take care in asking for clarification, commenting, and answering.
Check out our Code of Conduct.
1