I have started collaborating with a few friends on a project & they use the heroku git repository.
I cloned the repository a few days ago and they have since made some changes so I am trying to get the latest updates
I ran the git pull --rebase command as stated here(Is this the right way to do it?): https://devcenter.heroku.com/articles/sharing#merging-code-changes
I get the following error:
$ git pull --rebase
Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
My guess is that I messed around with the code and now it wants me to either commit or discard(is that what does stash means?) the changes. Is this what is happening? If this is the case I would like to discard any changes I might have made and just get the updated code from the git repository.
Any idea of what I can do?
