Ошибка git

By | May 28, 2015

root@koras-work:/var/www/uber/www# git pull
error: The following untracked working tree files would be overwritten by merge:
vendor/behat/mink-browserkit-driver/LICENSE
Aborting
root@koras-work:/var/www/uber/www# git fetch –all
Fetching origin
root@koras-work:/var/www/uber/www# git reset –hard origin/master

HEAD is now at 62b6fbc Добавлен конфиг на OAuth авторизацию. Добавлен виджет на страницу регистрации. Сделано тестовое подключенние VK.

 

Category: Uncategorized

Leave a Reply

Your email address will not be published. Required fields are marked *