git每日进阶--使用git切换仓库地址

本文用来总结一次使用Git切换仓库的经验

1. 查看远程仓库地址：git remote show origin
2. 切换远程仓库地址：git remote set-url origin xxx(新的仓库地址)
3. 获取最新代码：git pull

4. 如果不能获取代码并且提示：

   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> master
   

   则执行下面命令：git branch --set-upstream-to=origin/当前分支名 远程分支名

5. 如果还提示：$ git pull fatal: refusing to merge unrelated histories,则执行下面命令：git pull origin master allow-unrelated-histories
6. 然后再次更新代码：git pull
7. 如果提示代码冲突：master | MERGING,则执行回退命令：git reset --merge将代码恢复到更新代码之前
8. 如果想回退某个历史版本，执行：git checkout 版本号