Forge deployment failure

Hi,

From bitbucket.org:[NAME]/crud_lm_project
 * branch            master     -> FETCH_HEAD
   5c7b308..46f8cf1  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
    vendor/composer/autoload_classmap.php
    vendor/composer/autoload_static.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating 2dd6958..46f8cf1

I am doing the deployment for this project and i have not done anything different than normal. Merged working local branch to master on bitbucket, now when i want to deploy the new master branch i get the above error..

The only thing i know that happened is that my friend who i am working with made a quick edit of 2 lines in masterbranch on bitbucket itself, not on local.. Could this be the problem?

If so, please share idea's on how to fix this.

If no, help is welcome ;)

dongyukang

9 years ago

Level 3

Why don't you try what it says? stash them.

git stash

and retry to deploy.

Nash

9 years ago

Level 20

Git thinks that your local files have changes that would be overwritten by the merge (exactly like it says).

Like @dongyukang said, you can stash the local changes. If you know that the files in your master branch are the "right" ones and don't care about the local changes, then you could just revert them by doing git checkout vendor/composer

Edit: you can also run git diff to view which changes git is referring to

1 like

Please or to participate in this conversation.