Maybe having unstaged changes is how it is meant to be?