I have the following situation:
- A branch
- A topic branch
x off of
- I have made a commit to
master, and I would like to have this available in
x as well. It is my understanding that I have to rebase
This is what I do:
- Checkout the
VCS -> Git -> Branches -> Local branches -> x -> Checkout;
- Go to
VCS -> Git -> Rebase -> Select master in onto.
- Click Rebase.
At this point an error shows up telling me to check the VC console for details. This is what the console shows:
23:59:22.839: git rebase -i -v -m refs/heads/master
Cannot rebase: You have unstaged changes.
Additionally, your index contains uncommitted changes.
Please commit or stash them.
There are no pending changes in any branch anywhere. Everything is committed (and pushed to Bitbucket if that makes any difference). Am I doing this right? How can I rebase my branch on
I am trying to do what is described here:http://jeffkreeftmeijer.com/2010/the-magical-and-not-harmful-rebase/
Same question with no answers on stackoverflow:http://stackoverflow.com/questions/12133885/intellij-git-rebase-error
The error is not helpful at all and I have no idea how to fix it. I cannot use branching at all without this, any help please?