In a few areas you wrote you experienced untracked alterations, and in certain that you choose to had unstaged improvements. They're two various things and should be handled in different ways. Alternatively, You should use git stash or maybe more thoroughly git stash help save "title description" to avoid wasting your code in a very pseudo dedic