This question is similar to this one, but more specific.
I have a project with two branches: staging and beta.
I develop on staging, and use the master branch to fix bugs. So if I’m working on staging and I see an error, I change to master branch:
git checkout master
and do the stuff:
git add fileToAdd
git commit -m "bug fixed"
and then I merge with both branches:
git checkout staging
git merge master
git checkout beta
git merge beta
And doesn’t matter if there are other files on the working tree.
But now, when I try to change to the master branch, I’m getting an error:
error: Your local changes to the following files would be overwritten by checkout:
src/Pro/ConvocationBundle/Controller/DefaultController.php
Please, commit your changes or stash them before you can switch branches.
Aborting
I thought that I should remove the file from the staging area:
git reset HEAD src/Pro/ConvocationBundle/Controller/DefaultController.php
But I’m getting the same error. If I do git status, I get No changes to commit