Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a51dea0d
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a51dea0d
编写于
2月 01, 2018
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve doc/development/automatic_ce_ee_merge.md
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
498d3236
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
8 deletion
+23
-8
doc/development/automatic_ce_ee_merge.md
doc/development/automatic_ce_ee_merge.md
+23
-8
未找到文件。
doc/development/automatic_ce_ee_merge.md
浏览文件 @
a51dea0d
...
...
@@ -5,17 +5,32 @@ Enterprise Edition (look for the [`CE Upstream` merge requests]).
This merge is done automatically in a
[
scheduled pipeline
](
https://gitlab.com/gitlab-org/release-tools/-/jobs/43201679
)
.
If a merge is already in progress, the job
[
doesn't create a new one
](
https://gitlab.com/gitlab-org/release-tools/-/jobs/43157687
)
.
**
If you are pinged in a
`CE Upstream`
merge request to resolve a conflict,
please resolve the conflict as soon as possible or ask someone else to do it!
**
>**Note:**
It's ok to resolve more conflicts than the one that you are asked to resolve. In
that case, it's a good habit to ask for a double-check on your resolution by
someone who is familiar with the code you touched.
## What to do if you are pinged in a `CE Upstream` merge request to resolve a conflict?
1.
Please resolve the conflict as soon as possible or ask someone else to do it
-
It's ok to resolve more conflicts than the one that you are asked to resolve.
In that case, it's a good habit to ask for a double-check on your resolution
by someone who is familiar with the code you touched.
1.
Once you have resolved your conflicts, push to the branch (no force-push)
1.
Assign the merge request to the next person that has to resolve a conflict
1.
If all conflicts are resolved after your resolution is pushed, keep the merge
request assigned to you:
**
you are now responsible for the merge request to be
green
**
1.
If you need any help, you can ping the current [release managers], or ask in
the
`#ce-to-ee`
Slack channel
A few notes about the automatic CE->EE merge job:
-
If a merge is already in progress, the job
[
doesn't create a new one
](
https://gitlab.com/gitlab-org/release-tools/-/jobs/43157687
)
.
-
If there is nothing to merge (i.e. EE is up-to-date with CE), the job doesn't
create a new one
-
The job posts messages to the
`#ce-to-ee`
Slack channel to inform what's the
current CE->EE merge status (e.g. "A new MR has been created", "A MR is still pending")
[
`CE Upstream` merge requests
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=CE+upstream
[
release managers
]:
https://about.gitlab.com/release-managers/
## Always merge EE merge requests before their CE counterparts
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录