Skip to content

Instantly share code, notes, and snippets.

@xgqfrms
Created March 25, 2021 14:42
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save xgqfrms/0dc5ef81b61ab17e2b6e2913a0fd356f to your computer and use it in GitHub Desktop.
Save xgqfrms/0dc5ef81b61ab17e2b6e2913a0fd356f to your computer and use it in GitHub Desktop.
gitlab 发版流程图

gitlab 发版流程图

git workflow 发版流程

  1. 正常流程
# feature-xyz
$ git checkout feature-xyz
$ git pull


## 发 dev 测试
$ git checkout dev
$ git pull

# merge feature-xyz => dev
$ git merge feature-xyz


## 发 release 灰度/预发布
$ git checkout release
$ git pull

$ git checkout feature-xyz
$ git pull
# 1. merge release => feature-xyz
$ git merge release

$ git checkout release
$ git pull
# 2. merge feature-xyz => release
$ git merge feature-xyz


## 发 master 线上/生产
$ git checkout master
$ git pull

$ git checkout release
$ git pull
# 1. merge master => release
$ git merge master

$ git checkout master
$ git pull
# 2. merge release => master
$ git merge release
@xgqfrms
Copy link
Author

xgqfrms commented Mar 25, 2021

gitlab 发版流程图

git workflow 发版流程

  1. 正常流程
# feature-xyz
$ git checkout feature-xyz
$ git pull


## 发 dev 测试
$ git checkout dev
$ git pull

# merge feature-xyz => dev
$ git merge feature-xyz
$ git push


## 发 release 灰度/预发布
$ git checkout release
$ git pull

$ git checkout feature-xyz
$ git pull
# 1. merge release => feature-xyz
$ git merge release
$ git push

$ git checkout release
$ git pull
# 2. merge feature-xyz => release
$ git merge feature-xyz
$ git push


## 发 master 线上/生产
$ git checkout master
$ git pull

$ git checkout release
$ git pull
# 1. merge master => release
$ git merge master
$ git push

$ git checkout master
$ git pull
# 2. merge release => master
$ git merge release
$ git push

@xgqfrms
Copy link
Author

xgqfrms commented Mar 25, 2021

git alias

$ gco

$ gp

$ gad

$ gcm "meesage"


$ gps

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment