Git Error output

everytime I try to deploy I keep getting this git error output and I can't see why, everything in my repo is up to date and theres nothing to commit

From github.com:SequelMediaGroup/puckermob_laravel
 * branch            master     -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
    vendor/composer/autoload_classmap.php
    vendor/composer/installed.json
Please, commit your changes or stash them before you can merge.
Aborting
Updating c75a216..5f08fef

Why is it throwing this error when everything is clean and up to date?

bobbybouwmann

10 years ago

Level 88

It seems that it is not ignoring your vendor directory. Does your .gitignore hold to following line?

/vendor

unohuim

10 years ago

Level 6

I'm getting the same error.. and my .gitignore file certainly has that line. Any ideas ?

Please or to participate in this conversation.