git clone https://github.com/A/A.git //下载自己分支的代码
git remote add upstream https://github.com/B/B.git //将主线代码作为更新源
git add .
git stash //暂存自己分支当前的代码;
git fetch upstream //拉取主线的新代码;
git rebase upstream/master origin/master //和主线分支版本号统一;
git checkout master
git stash apply stash@{0} //刚刚暂存的代码合并到现在最新的代码中.
git add .
git commit -m "提交代码的注释信息"
git push -u origin master //将自己最新代码merge到主线
git fetch upstream
git merge upstream/master