Error: Cannot pull with rebase: You have unstaged changes

Question

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 mad

Answer 1

This works for me:

git fetch
git rebase --autostash FETCH_HEAD