1、checkout报错
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git checkout master
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 (huangshan)
2、google之后，发现有一个思路，git stash git pull，试试
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git stash
Saved working directory and index state WIP on huangshan: c17864e msg function 4
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git pull
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> huangshan
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git branch --set-upstream-to=origin/<c17864e> huangshan
bash: c17864e: No such file or directory
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git stash pop
On branch huangshan
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: .idea/workspace.xml
no changes added to commit (use "git add" and/or "git commit -a")
Dropped refs/stash@{0} (78333c57afb550703d0c0035593e7c929a7dd2d1)
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
执行命令报错，看提示，需要执行git add以及git commit
$ git add
Nothing specified, nothing added.
Maybe you wanted to say 'git add .'?
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git add .
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git commit -m "f4"
[huangshan 5b5596d] f4
1 file changed, 16 insertions(+), 7 deletions(-)
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git push
fatal: The current branch huangshan has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin huangshan
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git push --set-upstream origin huangshan
Counting objects: 4, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 557 bytes | 557.00 KiB/s, done.
Total 4 (delta 3), reused 0 (delta 0)
remote:
remote: To create a merge request for huangshan, visit:
remote: http://gitlab.hutaojie.com/huangshan/olmeca_split/merge_requests/new?merge_request%5Bsource_branch%5D=huangshan
remote:
To gitlab.hutaojie.com:huangshan/olmeca_split.git
c17864e..5b5596d huangshan -> huangshan
Branch huangshan set up to track remote branch huangshan from origin.
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (huangshan)
$ git checkout master
Switched to branch 'master'
Your branch is ahead of 'origin/master' by 3 commits.
(use "git push" to publish your local commits)
huangshan@PC20170731eew MINGW64 /d/a/olmeca_split (master)