create html folder
This commit is contained in:
30
gitflow.md
30
gitflow.md
@@ -25,34 +25,8 @@
|
|||||||
### 上版流程
|
### 上版流程
|
||||||
正常開發,兩星期上版一次,所以整個流程是以兩個星期為週期在重複。
|
正常開發,兩星期上版一次,所以整個流程是以兩個星期為週期在重複。
|
||||||
|
|
||||||
<table style="background-color: #1E1E1E; width: 100%">
|

|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td style="width: 25%; color: white;" colspan=3></td>
|
|
||||||
<td style="width: 25%; color: white; vertical-align: bottom; text-align: center;" colspan=3>第一週<br>星期四<br>develop merge to Master</td>
|
|
||||||
<td style="width: 25%; color: white; vertical-align: bottom; text-align: center;" colspan=3>第二週<br>星期三<br>Master merge to PRD</td>
|
|
||||||
<td style="width: 25%; color: white;" colspan=3></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td colspan=12>
|
|
||||||
<img src="images/git_schedule_arrow.png" style="width:100%; height: 100%">
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="width: 33%; color: white; text-align: center;" colspan=4>develop 開發</td>
|
|
||||||
<td style="width: 33%; color: white; text-align: center;" colspan=4>Stage 測試</td>
|
|
||||||
<td style="width: 33%; color: white; text-align: center" colspan=4>PRD上線</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
|
||||||
<td style="width: 33%; color: white; text-align: left; vertical-align: top;" colspan=4>1. 功能開發使用Dev_Feature分支<br>
|
|
||||||
2. 開發完後提取要求,合併至develop 分支</td>
|
|
||||||
<td style="width: 33%; color: white; text-align: left; vertical-align: top;" colspan=4>1. develop 分支合併至 Master<br>
|
|
||||||
2. 如果有需要修改,使用Master_HotFix</td>
|
|
||||||
<td style="width: 33%; color: white; text-align: left; vertical-align: top;" colspan=4>1. 上線至PRD環境<br>
|
|
||||||
2. 如需要修改,使用PRD_HotFix分支</td>
|
|
||||||
</tr>
|
|
||||||
</tobdy>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
#### Ex:
|
#### Ex:
|
||||||
2020-04-27 Stage _ 2020-05-06 PRD:
|
2020-04-27 Stage _ 2020-05-06 PRD:
|
||||||
|
|||||||
28
html/git_schedule_all.md
Normal file
28
html/git_schedule_all.md
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
<table style="background-color: #1E1E1E; width: 100%">
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td style="width: 25%; color: white;" colspan=3></td>
|
||||||
|
<td style="width: 25%; color: white; vertical-align: bottom; text-align: center;" colspan=3>第一週<br>星期四<br>develop merge to Master</td>
|
||||||
|
<td style="width: 25%; color: white; vertical-align: bottom; text-align: center;" colspan=3>第二週<br>星期三<br>Master merge to PRD</td>
|
||||||
|
<td style="width: 25%; color: white;" colspan=3></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan=12>
|
||||||
|
<img src="images/git_schedule_arrow.png" style="width:100%; height: 100%">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="width: 33%; color: white; text-align: center;" colspan=4>develop 開發</td>
|
||||||
|
<td style="width: 33%; color: white; text-align: center;" colspan=4>Stage 測試</td>
|
||||||
|
<td style="width: 33%; color: white; text-align: center" colspan=4>PRD上線</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td style="width: 33%; color: white; text-align: left; vertical-align: top;" colspan=4>1. 功能開發使用Dev_Feature分支<br>
|
||||||
|
2. 開發完後提取要求,合併至develop 分支</td>
|
||||||
|
<td style="width: 33%; color: white; text-align: left; vertical-align: top;" colspan=4>1. develop 分支合併至 Master<br>
|
||||||
|
2. 如果有需要修改,使用Master_HotFix</td>
|
||||||
|
<td style="width: 33%; color: white; text-align: left; vertical-align: top;" colspan=4>1. 上線至PRD環境<br>
|
||||||
|
2. 如需要修改,使用PRD_HotFix分支</td>
|
||||||
|
</tr>
|
||||||
|
</tobdy>
|
||||||
|
</table>
|
||||||
|
Before Width: | Height: | Size: 589 B After Width: | Height: | Size: 589 B |
BIN
images/git_schedule_all.png
Normal file
BIN
images/git_schedule_all.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
Reference in New Issue
Block a user