问题1

error: Your local changes to the following files would be overwritten by checkout:

*********

Please commit your changes or stash them before you can switch branches.

Aborting

解决方法

1、git stash

2、git checkout dev

3、git stash pop