then make a git reset --hard
after that try to pull again.
your local data will be overwritten by this command! So be careful...
Вопрос
when i am trying to get latest code from repository "git pull origin master" a message appear, error: Your local changes to the following files would be overwritten by merge: profile-summary-portlet/.project Please, commit your changes or stash them before you can merge. I dont want it to merege.
Решение
then make a git reset --hard
after that try to pull again.
your local data will be overwritten by this command! So be careful...
Другие советы
Well, the message says it all =). You can stash the changes and apply after if you do not want to merge now.