Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c6ab1e9d
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,发现更多精彩内容 >>
未验证
提交
c6ab1e9d
编写于
2月 16, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Document better the CE -> EE merge
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
2d2cdd64
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
26 addition
and
17 deletion
+26
-17
CONTRIBUTING.md
CONTRIBUTING.md
+10
-8
doc/development/limit_ee_conflicts.md
doc/development/limit_ee_conflicts.md
+16
-9
未找到文件。
CONTRIBUTING.md
浏览文件 @
c6ab1e9d
...
...
@@ -93,18 +93,20 @@ Please see the [UX Guide for GitLab].
### Retrospective
After each release (usually on the 22nd of each month), we have a retrospective
call where we discuss what went well, what went wrong, and what we can improve
for the next release. The [retrospective notes] are public and you are invited
to comment them.
If you're interested, you can even join the
[
retrospective call
][
retro-kickoff-call
]
.
After each release, we have a retrospective call where we discuss what went well,
what went wrong, and what we can improve for the next release. The
[retrospective notes] are public and you are invited to comment on them.
If you're interested, you can even join the
[
retrospective call
][
retro-kickoff-call
]
, on the first working day after the
22nd at 6pm CET / 9am PST.
### Kickoff
Before working on the next release
(usually on the 8th of each month)
, we have a
Before working on the next release, we have a
kickoff call to explain what we expect to ship in the next release. The
[kickoff notes] are public and you are invited to comment them.
If you're interested, you can even join the
[
kickoff call
][
retro-kickoff-call
]
.
[kickoff notes] are public and you are invited to comment on them.
If you're interested, you can even join the
[
kickoff call
][
retro-kickoff-call
]
,
on the first working day after the 7th at 6pm CET / 9am PST..
[
retrospective notes
]:
https://docs.google.com/document/d/1nEkM_7Dj4bT21GJy0Ut3By76FZqCfLBmFQNVThmW2TY/edit?usp=sharing
[
kickoff notes
]:
https://docs.google.com/document/d/1ElPkZ90A8ey_iOkTvUs_ByMlwKK6NAB2VOK5835wYK0/edit?usp=sharing
...
...
doc/development/limit_ee_conflicts.md
浏览文件 @
c6ab1e9d
...
...
@@ -2,19 +2,26 @@
This guide contains best-practices for avoiding conflicts between CE and EE.
##
Context
##
Daily CE Upstream merge
Usually, GitLab Community Edition is merged into the Enterprise Edition once a
week. During these merges, it's very common to get conflicts when some changes
in CE do not apply cleanly to EE
.
GitLab Community Edition is merged daily into the Enterprise Edition (look for
the [
`CE Upstream`
merge requests]). The daily merge is currently done manually
by four individuals
.
There are a few things that can help you as a developer to:
**
If a developer pings you in a
`CE Upstream`
merge request for help with
resolving conflicts, please help them because it means that you didn't do your
job to reduce the conflicts nor to ease their resolution in the first place!
**
-
know when your merge request to CE will conflict when merged to EE
-
avoid such conflicts in the first place
-
ease future conflict resolutions if conflict is inevitable
To avoid the conflicts beforehand when working on CE, there are a few tools and
techniques that can help you:
## Check the `rake ee_compat_check` in your merge requests
-
know what are the usual types of conflicts and how to prevent them
-
the CI
`rake ee_compat_check`
job tells you if you need to open an EE-version
of your CE merge request
[
`CE Upstream` merge requests
]:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=CE+upstream
## Check the status of the CI `rake ee_compat_check` job
For each commit (except on
`master`
), the
`rake ee_compat_check`
CI job tries to
detect if the current branch's changes will conflict during the CE->EE merge.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录