修改"维护linx 6.0.42.41的流程"文档

新文件:   workflow/images/merge3.png
	修改:     workflow/workflow.md

Signed-off-by: Li,Juejie <jjli@linx-info.com>
This commit is contained in:
Li,Juejie
2018-11-02 17:18:23 +08:00
parent 842035e0fe
commit 4b3e5d6e07
2 changed files with 3 additions and 0 deletions

BIN
workflow/images/merge3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@@ -105,3 +105,6 @@ git push origin 4.2/XXXX:4.2/XXXX
![merge](images/merge2.png)
这里只需要从“Assign to“的下拉列表中选择有权利合并分支的人即可然后点击绿色的“Submit new merge request“完成合并请求的创建。
如果同意合并分支点击页面中的“Merge”按钮如果不同意“合并请求”点击“Close merge request”关闭请求如图所示
![merge](images/merge3.png)