1、pycharm里面获取分支
先在gitlab官网上,建立好分支(省略),然后在pycharm里面先pull到远程分支代码
从master换成huangshan的分支
2、Git CMD执行切换命令
2.1、在Git CMD里面执行切换到单独的分支,提示未成功
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (master)
$ git checkout huangshan
error: Your local changes to the following files would be overwritten by checkout:
.idea/workspace.xml
Please commit your changes or stash them before you switch branches.
Aborting
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (master)
分析是总工程有个文件workspace.xml没有提交,因为工程是在pycharm里面编辑的,所以需要去pycharm里面commit整个工程到当前的maste分支
2.2、去pycharm里面提交整个工程
2.3、然后再切换分支,OK
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (master)
$ git checkout -b huangshan
Switched to a new branch 'huangshan'
M .idea/workspace.xml
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
3、去pycharm检查commit的分支结构,就会变成huangshan分支
pycharm里面随意一个python文件或者目录,右键 → “Git” → "Repository" → "Push",之后看到如下push
1、pycharm里面获取分支
先在gitlab官网上,建立好分支(省略),然后在pycharm里面先pull到远程分支代码
从master换成huangshan的分支
2、Git CMD执行切换命令
2.1、在Git CMD里面执行切换到单独的分支,提示未成功
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (master)
$ git checkout huangshan
error: Your local changes to the following files would be overwritten by checkout:
.idea/workspace.xml
Please commit your changes or stash them before you switch branches.
Aborting
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (master)
分析是总工程有个文件workspace.xml没有提交,因为工程是在pycharm里面编辑的,所以需要去pycharm里面commit整个工程到当前的maste分支
2.2、去pycharm里面提交整个工程
2.3、然后再切换分支,OK
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (master)
$ git checkout -b huangshan
Switched to a new branch 'huangshan'
M .idea/workspace.xml
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
3、去pycharm检查commit的分支结构,就会变成huangshan分支
pycharm里面随意一个python文件或者目录,右键 → “Git” → "Repository" → "Push",之后看到如下push