Alzaabi98
1162
6
Forge

failed deployment using Forge.. "your local changes will be overwritten "

Posted 2 years ago by Alzaabi98

Can someone help .. i am getting this error from time to time in Forge. The only solution is i remove repository and start from scratch.. the issues that it comes after few day.s.. what i am doing wrong to cause this error when I deploy and how can I solve it.


Mon Sep 19 20:29:14 GST 2016
From github.com:
 * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
    composer.json
    composer.lock
Please, commit your changes or stash them before you can merge.
Aborting
Updating 7ed39dd..e63d3cc

Please sign in or create an account to participate in this conversation.