laravel - Forge: git pull not updating -


$ git add . $ git commit -m "commit message" $ git push 

the code gets pushed repo expected. forge deployment error message returns

branch master -> fetch_head error: local changes following files overwritten merge: // ...files change... please, commit changes or stash them before can merge. aborting

how can resolve this? commits not merged? on repository. need stash? if so, next??

tried following other examples unwilling experiment without advanced knowledge of git.

use -a instead of . git add

$ git add -a $ git commit -m "commit message" $ git push 

now, try git pull.

n.b: git add . stage modified , new files , git add -a stage modified, new , deleted files.


Comments