diff --git a/gitflow.md b/gitflow.md index ed28205..32195f3 100644 --- a/gitflow.md +++ b/gitflow.md @@ -27,6 +27,9 @@ ![上版時程](images/git_schedule_all.png) +連續多個版本的流程就像以下圖示 +![多版本上版時程](images/git_schedule_multi.png) + #### Ex: 2020-04-27 Stage _ 2020-05-06 PRD: diff --git a/html/git_schedule_all.md b/html/git_schedule_all.md index 9dd1adf..9b72355 100644 --- a/html/git_schedule_all.md +++ b/html/git_schedule_all.md @@ -2,19 +2,19 @@ - 第一週
星期四
develop merge to Master - 第二週
星期三
Master merge to PRD + 第一週-星期四
develop merge to Master
build and deploy to Stage
+ 第二週-星期三
Master merge to PRD
build and deploy to PRD
- - + + - develop 開發 - Stage 測試 - PRD上線 + develop 開發 + Stage 測試 + PRD上線 1. 功能開發使用Dev_Feature分支
diff --git a/html/git_schedule_multi.md b/html/git_schedule_multi.md new file mode 100644 index 0000000..9ea3528 --- /dev/null +++ b/html/git_schedule_multi.md @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
第一週-星期四第二週-星期三第三週-星期四第四週-星期三
developStagePRD
developStagePRD
+ + + diff --git a/images/git_schedule_all.png b/images/git_schedule_all.png index 14d6fa9..6d21ace 100644 Binary files a/images/git_schedule_all.png and b/images/git_schedule_all.png differ diff --git a/images/git_schedule_multi.png b/images/git_schedule_multi.png new file mode 100644 index 0000000..351496e Binary files /dev/null and b/images/git_schedule_multi.png differ