Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Forever310
druid
提交
a58df303
D
druid
项目概览
Forever310
/
druid
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
druid
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
a58df303
编写于
9月 29, 2015
作者:
D
dclim
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor documentation fixes for CONTRIBUTING.md
上级
d2e400f0
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
7 deletion
+7
-7
CONTRIBUTING.md
CONTRIBUTING.md
+7
-7
未找到文件。
CONTRIBUTING.md
浏览文件 @
a58df303
...
@@ -7,12 +7,12 @@ When submitting a pull request (PR), please use the following guidelines:
...
@@ -7,12 +7,12 @@ When submitting a pull request (PR), please use the following guidelines:
-
Keep the number of commits small and combine commits for related changes.
-
Keep the number of commits small and combine commits for related changes.
Each commit should compile on its own and ideally pass tests.
Each commit should compile on its own and ideally pass tests.
-
If you are introducing a new feature you may want to first submit your idea
-
If you are introducing a new feature you may want to first submit your idea
of feedback in
the
[
mailing list
](
mailto:druid-development@googlegroups.com
)
.
for feedback to
the
[
mailing list
](
mailto:druid-development@googlegroups.com
)
.
-
Bugfixes should include a unit
-
test or integration test reproducing the issue.
-
Bugfixes should include a unit
test or integration test reproducing the issue.
-
Non-trivial features should include unit
-test
covering the new functionality.
-
Non-trivial features should include unit
tests
covering the new functionality.
-
Make sure your code respects existing formatting conventions. We don't have a
-
Make sure your code respects existing formatting conventions. We don't have a
formal style guide yet, but use your own judgement. If you are using
formal style guide yet, but use your own judgement. If you are using
IntelliJ, you can
use import our code style settings jar
IntelliJ, you can
import our code style settings jar:
[
intellij_formatting.jar
](
https://github.com/druid-io/druid/raw/master/intellij_formatting.jar
)
.
[
intellij_formatting.jar
](
https://github.com/druid-io/druid/raw/master/intellij_formatting.jar
)
.
-
Keep formatting changes in separate commits to make code reviews easier and
-
Keep formatting changes in separate commits to make code reviews easier and
distinguish them from actual code changes.
distinguish them from actual code changes.
...
@@ -114,9 +114,9 @@ When submitting a pull request (PR), please use the following guidelines:
...
@@ -114,9 +114,9 @@ When submitting a pull request (PR), please use the following guidelines:
# FAQ
# FAQ
### Help! I merged changes from upstream and cannot figure out how to resolve conflits when rebasing!
### Help! I merged changes from upstream and cannot figure out how to resolve confli
c
ts when rebasing!
Never fear
, if you occasionally merged upgstream/master, here is another way to squash your changes into a single commit
Never fear
! If you occasionally merged upstream/master, here is another way to squash your changes into a single commit:
1.
First, rename your existing branch to something else, e.g.
`feature-xxx-unclean`
1.
First, rename your existing branch to something else, e.g.
`feature-xxx-unclean`
...
@@ -137,7 +137,7 @@ Never fear, if you occasionally merged upgstream/master, here is another way to
...
@@ -137,7 +137,7 @@ Never fear, if you occasionally merged upgstream/master, here is another way to
git commit
git commit
```
```
1.
You can now submit this new branch and create or replace your existing pull request
1.
You can now submit this new branch and create or replace your existing pull request
.
```
```
git push origin [--force] feature-xxx:feature-xxx
git push origin [--force] feature-xxx:feature-xxx
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录