Git: can't switch between branches

Question

In a local folder with several files, I have a git repository for which branch x only includes a few of those files, and the master one inc

Answer 1

You have some files (the ones listed) that have been edited, but by checking out a other branch, you'll overwrite (and lose) these edits.

You can commit these changes, or stash them.

See : http://git-scm.com/book/en/v1/Git-Tools-Stashing