How to update local repository with pull

Question

I have been working on my repository on a local branch... I finally made all the changes needed and committed then pushed to my github account.

I then went to another computer to pull that copy down to update my out of date local version... When I try and pull it, it says:

Cannot pull because there are uncommitted changes. Commit or undo your changes before pulling again. See the Output window for details.

How do I resolve this issue?

Answer 1

As it says, you should either commit or undo your changes. You can save them for letter with

git stash

when you want to reaply changes after stash, do: git stash pop

Or you can commit them with:

git commit -am 'Your commit message'

The last option, if you do not need your changes, you can simple remove them completely:

git reset --hard

Beware that you cannot restore changes after this command.

There are analogs of these commands in tortoisegit.