Gitlab管理之六–Gitlab分支管理
阿新 • • 發佈:2019-01-02
1. 切換到專案位置。
2. 建立一個專案的一新分支。
mike@win10-001 MINGW64 ~/cookbook/cookbook (master)
$ git branch first-branch
3. 切換到新建的分支下。
mike@win10-001 MINGW64 ~/cookbook/cookbook (master)
$ git checkout first-branch
Switched to branch 'first-branch'
mike@win10-001 MINGW64 ~/cookbook/cookbook (first-branch)
4. 第2步和第3步可以合併成一步。
mike@win10-001 MINGW64 ~/cookbook/cookbook (first-branch)
$ git checkout -b first-branch
5. 改變檔案的內容。
mike@win10-001 MINGW64 ~/cookbook/cookbook (first-branch)
$ echo "Change" >> README.md
6. 提交這個改變
$ git commit -a -m 'Readme changed'
warning: LF will be replaced by CRLF in README.md.
The file will have its original line endings in your working directory.
[first-branch dc7b6d5] Readme changed
1 file changed, 1 insertion(+)
7. 推送分支到gitlab伺服器
[email protected]001 MINGW64 ~/cookbook/cookbook (first-branch)
$ git push -u origin first-branch
Counting objects: 3, done.
Writing objects: 100% (3/3), 262 bytes | 131.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0)
remote:
remote: To create a merge request for first-branch, visit:
remote: http://gitlab.aishangwei.net/root/cookbook/merge_requests/new?merge_request%5Bsource_branch%5D=first-branch
remote:
To gitlab.aishangwei.net:root/cookbook.git
* [new branch] first-branch -> first-branch
Branch 'first-branch' set up to track remote branch 'first-branch' from 'origin'.
8. 在Gitlab伺服器檢視我們推送的分支
9. 從以下圖可以看到建立的分支first-branch和master分支。
10. 切換到master分支。
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
11. 合併first-branch分支到master分支。
$ git merge first-branch –no-ff
12. 從第11步輸出的資訊可以看到,給我們一個機會去改變提交的資訊。在我們儲存和關閉編輯器的時候,這個分支將會合並,具體資訊如下.
[email protected]001 MINGW64 ~/cookbook/cookbook (master)
$ git merge first-branch --no-ff
Merge made by the 'recursive' strategy.
README.md | 1 +
1 file changed, 1 insertion(+)
13. 推送改變到Gitlab上的master.
[email protected]001 MINGW64 ~/cookbook/cookbook (master)
$ git push origin master
Counting objects: 1, done.
Writing objects: 100% (1/1), 223 bytes | 223.00 KiB/s, done.
Total 1 (delta 0), reused 0 (delta 0)
To gitlab.aishangwei.net:root/cookbook.git
53ec2ca..5e1ebdd master –> master
14. 刪除所建立的分支。
[email protected]001 MINGW64 ~/cookbook/cookbook (master)
$ git push origin --delete first-branch
To gitlab.aishangwei.net:root/cookbook.git
- [deleted] first-branch