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?
Do git status, this will show you what files have changed. Since you stated that you don't want to keep the changes you can do git checkout -- <file name> or git reset --hard to get rid of the changes.
For the most part, git will tell you what to do about changes. For example, your error message said to git stash your changes. This would be if you wanted to keep them. After pulling, you would then do git stash pop and your changes would be reapplied.
git status also has how to get rid of changes depending on if the file is staged for commit or not.
Pulling with rebase is a good practice in general.
However you cannot do that if your index is not clean, i.e. you have made changes that have not been committed.
You can do this to work around, assuming you want to keep your changes:
git stashgit stash apply stash@{0} or the simpler git stash popIf you want to keep your working changes while performing a rebase, you can use --autostash. From the documentation:
Before starting rebase, stash local modifications away (see git-stash[1]) if needed, and apply the stash when done.
For example:
git pull --rebase --autostash
When the unstaged change is because git is attempting to fix eol conventions on a file (as is always my case), no amount of stashing or checking-out or resetting will make it go away.
However, if the intent is really to rebase and ignore unstaged changed, then what I do is delete the branch locally then check it out again.
git checkout -f anyotherbranchthanthisone
git branch -D thebranchineedtorebase
git checkout thebranchineedtorebase
Voila! It hasn't failed me yet.
You can always do
git fetch && git merge --ff-only origin/master
and you will either get (a) no change if you have uncommitted changes that conflict with upstream changes or (b) the same effect as stash/pull/apply: a rebase to put you on the latest changes from HEAD and your uncommitted changes left as is.
If you want to automatically stash your changes and unstash them for every rebase, you can do this:
git config --global rebase.autoStash true
First start with a
git status
See if you have any pending changes. To discard them, run
git reset --hard
Follow the below steps
From feature/branch (enter the below command)
git checkout master
git pull
git checkout feature/branchname
git merge master
This works for me:
git fetch
git rebase --autostash FETCH_HEAD
Source: Stackoverflow.com