Level 1
Same problem, have you solved it?
Aug 11, 2016
4
Level 4
Your local changes to the following files would be overwritten by merge
has anyone seen or fixed this error on forge deploy
* branch master -> FETCH_HEAD
64758ec..71b1817 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
.env
Please, commit your changes or stash them before you can merge.
all my .env files are og gitignore and its driving me nuts (as alot has today)
Level 53
Are you commiting your .env file to the repo? If so, you are exposing yourself and someone probably already has any specific config info.
Level 4
Yah it was the fact I had the .env committing and not on git ignore. I just started my repo again and made sure the .env etc was on git ignore
Level 4
Yes gitignore these files
.env & vendor folder
simple add these in gitignore.
For removing your current problem commit your server changes and push as well. After that ignore the files you can set .env file.
Regards Arfan
Please or to participate in this conversation.