$ git status
On branch goods
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git checkout -- ..." to discard changes in working directory)
modified: app/styles/main.scss
Untracked files:
(use "git add ..." to include in what will be committed)
app/styles/cost/
no changes added to commit (use "git add" and/or "git commit -a")
error: Your local changes to the following files would be overwritten by checkout:
app/styles/main.scss
Please commit your changes or stash them before you switch branches.
error: The following untracked working tree files would be overwritten by checkout:
app/styles/cost/__caption/__caption.scss
app/styles/cost/__currence/__currence.scss
app/styles/cost/__price/__price.scss
app/styles/cost/__weight/__weight.scss
app/styles/cost/cost.scss
Please move or remove them before you switch branches.
Aborting
Подскажите пожалуйста, теперь он не пускает меня в первую ветку, из которой я копировал! Просит закоммитить ветку в которую копировал. Делаю git stash , но git все-равно не переключает