接着上文《Git 基礎 - 克隆遠程倉庫到本地,修改后推送到遠程》:
[@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git checkout -b dev origin/dev #在本地創建並切換到dev分支,並連接到遠程的dev分支 [@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git pull origin dev #在本地dev分支拉取遠程dev分支 [@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ ll # 遠程dev分支內容已經pull下來 total 16 drwxr-xr-x 10 walker staff 320B 2 2 12:59 . drwxr-xr-x 6 walker staff 192B 2 2 12:38 .. -rw-r--r-- 1 walker staff 6.0K 2 2 12:59 .DS_Store drwxr-xr-x 15 walker staff 480B 2 2 13:02 .git -rw-r--r-- 1 walker staff 0B 2 2 12:59 README.md -rw-r--r-- 1 walker staff 0B 2 2 12:59 __init__.py drwxr-xr-x 7 walker staff 224B 2 2 12:59 __pycache__ drwxr-xr-x 9 walker staff 288B 2 2 12:59 data drwxr-xr-x 6 walker staff 192B 2 2 12:59 merge drwxr-xr-x 8 walker staff 256B 2 2 12:59 utils [@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git checkout master [@wooluwalkerdeMacBook-Pro:wenjian (master)]$ ll # master分支並沒有dev分支的內容 total 8 drwxr-xr-x 4 walker staff 128B 2 2 13:04 . drwxr-xr-x 6 walker staff 192B 2 2 12:38 .. drwxr-xr-x 15 walker staff 480B 2 2 13:04 .git -rw-r--r-- 1 walker staff 34B 2 2 13:04 README.md [@wooluwalkerdeMacBook-Pro:wenjian (master)]$ git merge dev #將本地dev分支合並到本地master分支 [@wooluwalkerdeMacBook-Pro:wenjian (master)]$ git status #本地master分支比遠程master分支提前 On branch master Your branch is ahead of 'origin/master' by 4 commits. (use "git push" to publish your local commits) [@wooluwalkerdeMacBook-Pro:wenjian (master)]$ git push # 將本地master分支推送到遠程master分支,在web頁面可看到遠程master分支上有了新增內容