In a few places you wrote you experienced untracked alterations, and in some that you simply had unstaged modifications. They're two different things and will be taken care of otherwise.Alternatively, You should use git stash or even more carefully git stash help save "identify description" to save lots of your code in a very pseudo commit. This do