Merge from master
打开GitShell
进入目录
git checkout master
git pull
git checkout mybranch
git merge master
git status
打开GitHub软件切换到mybranch
点击Sync
打开GitShell
进入目录
git checkout master
git pull
git checkout mybranch
git merge master
git status
打开GitHub软件切换到mybranch
点击Sync