git问题解决

解决change id 的问题

  git push
  missing Change-Id in commit message
  git log 
  git commit --amend
  git push ok

冲突：git pull 冲突

error: Your local changes to the following files would be overwritten by merge:
	readme.txt
git stash list
git stash drop

Please, commit your changes or stash them before you can merge解决：git stash git pull git stash pop 去掉原来的readme.txt的符号 git add

Untracked files

rm -rf *
  git clone ssh://lizhexia@10.60.1.29:29418/pocketavatars/src/tests.git
  scp -p -P 29418 lizhexia@10.60.1.29:hooks/commit-msg .git/hooks/
  git commit --amend
:wq!

更新代码库最新代码：git reset --hard

查看branch：git branch
切换分支：git checkout -B dev origin/dev

git stash list
git stash drop

打回上一版本：

1.git commit
2.git reset --soft {commit-id}如：d2b5f2bb47e3fcb8f5692c33216bd82d629711c2