xgqfrms / git

git all in one
https://git.xgqfrms.xyz
MIT License
2 stars 1 forks source link

gitlab 发版流程图 #34

Open xgqfrms opened 3 years ago

xgqfrms commented 3 years ago

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 commented 3 years ago

image

xgqfrms commented 3 years ago

image

xgqfrms commented 3 years ago

git alias

$ gco

$ gp

$ gad

$ gcm "meesage"

$ gps