当master代码改动了，而自己却不知道，并且在不知道的情况下继续开发写代码，此时自己客户端的master分支代码不是最新的代码。不用担心，以下命令可以pull到master的最新代码。
命令：
git checkout master
git pull
git checkout Usage-Report
git merge master
git push
具体实现代码：
具体实现代码：
bayu@BAYU1 MINGW64 /c/baiyu/hubot (Usage-Report-v1)
$ git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
bayu@BAYU1 MINGW64 /c/baiyu/hubot (master)
$ git pull
remote: Counting objects: 27, done.
remote: Total 27 (delta 19), reused 19 (delta 19), pack-reused 8
Unpacking objects: 100% (27/27), done.
From https://partner.github.hpe.com/CAS/hubot
220c669..fabdc53 master -> origin/master
Updating 220c669..fabdc53
Fast-forward
bot.sh | 3 ++-
docker-compose-dev.yml | 1 +
hubot/Dockerfile | 2 +-
hubot/environment.sh | 9 ++++++++-
hubot/hubot_start.sh | 4 ++--
hubot/scripts/common.coffee | 7 ++++++-
hubot/scripts/github.coffee | 6 +++++-
hubot/scripts/scheduled.coffee | 20 ++++++++++----------
8 files changed, 35 insertions(+), 17 deletions(-)
bayu@BAYU1 MINGW64 /c/baiyu/hubot (master)
$ git checkout Usage-Report-v1
Switched to branch 'Usage-Report-v1'
bayu@BAYU1 MINGW64 /c/baiyu/hubot (Usage-Report-v1)
$ git merge master
Merge made by the 'recursive' strategy.
bot.sh | 3 ++-
docker-compose-dev.yml | 1 +
hubot/Dockerfile | 2 +-
hubot/environment.sh | 9 ++++++++-
hubot/hubot_start.sh | 4 ++--
hubot/scripts/common.coffee | 7 ++++++-
hubot/scripts/github.coffee | 6 +++++-
hubot/scripts/scheduled.coffee | 20 ++++++++++----------
8 files changed, 35 insertions(+), 17 deletions(-)
bayu@BAYU1 MINGW64 /c/baiyu/hubot (Usage-Report-v1)
$ git push
fatal: The current branch Usage-Report-v1 has no upstream branch.
To push the current branch and set the remote as upstream, use
git push --set-upstream origin Usage-Report-v1