首先，在gitLab页面上修改README.md并提交。
### 本地master分支不能向远程master提交，因为远程master已经修改
[@wooluwalkerdeMacBook-Pro:wenjian (master)]$ git push
To ssh://******.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'ssh://git@******.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
### 在本地master 分支将远程master代码pull下来
[@wooluwalkerdeMacBook-Pro:wenjian (master)]$ git pull
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 1), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From ssh://******
19cfeea..a565481 master -> origin/master
Updating 19cfeea..a565481
Fast-forward
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
### 查看git commit 日志，可以看到本地 master 和 dev 分支的最新状态
[@wooluwalkerdeMacBook-Pro:wenjian (master)]$ git dog
* a565481 (HEAD -> master, origin/master, origin/HEAD) Update README.md
* 19cfeea 第一次将远程dev分支代码合并到master分支Merge branch 'dev'
|\
| * b1777d8 (origin/dev, dev) commit merge_excel_utils
| * ee37473 manage utils
| * 0b6e16c commit files
* | 441940f 添加项目说明
|/
* 0f1f9d7 Initial Commit
### 切换到本地dev分支
[@wooluwalkerdeMacBook-Pro:wenjian (master)]$ git co dev
Switched to branch 'dev'
Your branch is up to date with 'origin/dev'.
### 将本地master分支合并到本地dev分支
[@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git merge master
Updating b1777d8..a565481
Fast-forward
README.md | 1 +
1 file changed, 1 insertion(+)
### 查看git log，现在 本地 master 分支 和 dev 分支已经在同一状态
[@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git dog
* a565481 (HEAD -> dev, origin/master, origin/HEAD, master) Update README.md
* 19cfeea 第一次将远程dev分支代码合并到master分支Merge branch 'dev'
|\
| * b1777d8 (origin/dev) commit merge_excel_utils
| * ee37473 commit utils
| * 0b6e16c commit files
* | 441940f 添加项目说明
|/
* 0f1f9d7 Initial Commit
### 将本地dev分支推送到远程dev分支
[@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git push origin dev:dev
Total 0 (delta 0), reused 0 (delta 0)
remote:
remote: To create a merge request for dev, visit:
remote: http://******?merge_request%5Bsource_branch%5D=dev
remote:
To ssh://******.git
b1777d8..a565481 dev -> dev