Most of the time when I try to checkout another existing branch, Git doesn\'t allow me if I have some uncommitted changes on the current branch. So I\'ll have to commit or s
The correct answer is
git checkout -m origin/master
It merges changes from the origin master branch with your local even uncommitted changes.