* Add tips for merge code locally.

This commit is contained in:
dingguodong
2021-09-07 10:02:52 +08:00
parent a786e5f00d
commit ee13e00554
2 changed files with 3 additions and 1 deletions
+1
View File
@@ -86,6 +86,7 @@ $lang->mr->mergeSuccess = "Merge Request Successfully";
$lang->mr->commandDocument = <<< EOD
<div class='detail-title'>Check out, review and merge locally</div>
<div class='detail-content'>
<p><strong>Note: This merge request status will be changed after you merge locally and you will need to delete this merge request or submit new code.</strong></p>
<p>
step 1. Fetch and check out the branch for this merge request
<pre>
+2 -1
View File
@@ -77,7 +77,7 @@ $lang->mr->mergeSuccess = "已成功合并";
/**
* Merge Command Document.
*
* %s source_roject::http_url_to_repo
* %s source_project::http_url_to_repo
* %s mr::source_branch
* %s source_project::path_with_namespace . '-' . mr::source_branch
* %s mr::target_branch
@@ -87,6 +87,7 @@ $lang->mr->mergeSuccess = "已成功合并";
$lang->mr->commandDocument = <<< EOD
<div class='detail-title'>在本地检出、审核和手动合并</div>
<div class='detail-content'>
<p><strong>注意:您在本地合并后此合并请求将变为不可合并状态,需要删除此合并请求或者提交新的代码。</strong></p>
<p>
1 . 获取并查看此合并请求的分支
<pre>