error: Your local changes to the following files would be overwritten by merge:

Posted by

Error:

error: Your local changes to the following files would be overwritten by merge: .env.example Please commit your changes or stash them before you merge. Aborting

Solution:

You can either commit your changes before you do the merge, or you stash them:

git stash save
git pull
git stash pop

Then, add your changes and push to master:

git add .
git commit -m 'your message'
git push -u origin master
Subscribe
Notify of
guest
0 Comments
Inline Feedbacks
View all comments
0
Would love your thoughts, please comment.x
()
x