Background:
当有人对master进行更新之后,你想让已经创建的分支内容更新到master的最新状态,
1bpan@5CG7022BM2 MINGW64 /d/GitRep/JIRA_Extensions (master) 2$ git checkout 20180315 //切换到分支下 3Switched to branch '20180315' 4Your branch is behind 'origin/master' by 17 commits, and can be fast-forwarded. 5 (use "git pull" to update your local branch) 6 7bpan@5CG7022BM2 MINGW64 /d/GitRep/JIRA_Extensions (20180315) 8$ git merge master //合并master到分支, 9Updating cee69ca..8b0ec9a 10Fast-forward 11 .gitignore | 2 + 12 .../functions/ExtractGroupMembersToExcelFile.java | 225 +++++++++++++++++++++ 13 2 files changed, 227 insertions(+) 14 create mode 100644 src/main/java/com/nokia/jira/functions/ExtractGroupMembersToExcelFile.java 15 16bpan@5CG7022BM2 MINGW64 /d/GitRep/JIRA_Extensions (20180315) 17$ git status 18On branch 20180315 19Your branch is up-to-date with 'origin/master'. 20nothing to commit, working tree clean 21 22bpan@5CG7022BM2 MINGW64 /d/GitRep/JIRA_Extensions (20180315) 23$ git push origin 20180315 //push到远程分支 24fatal: HttpRequestException encountered. 25 An error occurred while sending the request. 26Username for 'https://github.com': 962720900 27Total 0 (delta 0), reused 0 (delta 0) 28To https://github.com/962720900/JiraExtensionFunctions.git 29 e713274..8b0ec9a 20180315 -> 20180315