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 popThen, add your changes and push to master:
git add .
git commit -m 'your message'
git push -u origin master
