Skip to content

Conversation

livc
Copy link
Member

@livc livc commented Dec 14, 2016

resolve #835 contribute_to_paddle.

Thanks.

@luotao1
Copy link
Contributor

luotao1 commented Dec 14, 2016

#874 merge了之后,再对应修改一下吧。

@livc
Copy link
Member Author

livc commented Dec 14, 2016

OK

@@ -0,0 +1,119 @@
# 如何贡献代码

我们真诚地感谢您的贡献。你能使用 fork 和 pull request 的工作流来合并(merge)代码。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

你能使用 fork 和 pull request 的工作流来合并(merge)代码。
->
欢迎通过 GitHub 的 fork 和 pull request 流程来提交代码。


## 代码要求
- 你的代码必须完全遵守 [doxygen](http://www.stack.nl/~dimitri/doxygen/) 的样式。
- 确保编译器选项 WITH\_STYLE\_CHECK 已打开,并且编译器通过代码样式检查。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

确保编译器选项 WITH_STYLE_CHECK 已打开,并且编译能通过代码样式检查。

## [Fork](https://help.github.com/articles/fork-a-repo/)

转到GitHub页面,然后单击“Fork”按钮。
这就是这么简单。
Copy link
Contributor

@gangliao gangliao Dec 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

转到GitHub页面,然后单击“Fork”按钮。
-》
跳转到PaddlePaddle GitHub首页,然后单击 Fork 按钮。

这就是这么简单。 -》 这句删除,不要了


## 克隆(Clone)

Paddle 目前使用[git流分支模型](http://nvie.com/posts/a-successful-git-branching-model/)。
Copy link
Contributor

@gangliao gangliao Dec 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Paddle 目前使用[git流分支模型](http://nvie.com/posts/a-successful-git-branching-model/)进行开发,测试,发行和维护。

@@ -0,0 +1,131 @@
# 如何贡献代码

我们真诚地感谢您的贡献,欢迎通过 GitHub 的 fork 和 pull request 流程来提交代码。。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

。。-》 。

的 PR 不能提交代码到 Paddle。

你可以通过 `pip install pre-commit` 安装 [pre-commit](http://pre-commit.com/),
目前 Paddle 使用 `clang-format` 来格式化 c/cpp 资源。请确保 clang-format 版本在3.8以上。
Copy link
Contributor

@gangliao gangliao Dec 15, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

目前 Paddle 使用 `clang-format` 来调整C/C++源代码格式。


## 使用最新版本更新你的 pull 请求

在代码审查(code review)期间,由于 baidu/Paddle 中新的提交导致你的 pull 请求可能会失效。如果没有冲突,GitHub允许自动更新。 你可以点击 pull request 页面中的“更新分支(Update Branch)”按钮。 但是在这种冲突情况下,你需要手动进行更新。你需要在本地仓库执行如下命令:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

但是如果存在代码冲突,你需要手动进行更新。

```shell
git pull --rebase upstream develop
```
如果本地没有唯一提交,git 将简单地执行快进。但是,如果你一直在做一些改变(绝大多数情况下不应该),你可能要处理冲突。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

唯一 -》 删除,不要了

Copy link
Contributor

@gangliao gangliao left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice job! Please follow my feedback to change several words and sentences.

@gangliao
Copy link
Contributor

Hi, @livc

Thanks for your continuous contribution.
Looking forward to reviewing your PR again!

@livc
Copy link
Member Author

livc commented Dec 15, 2016

@gangliao You're welcome! : )

@luotao1 luotao1 merged commit 4a01887 into PaddlePaddle:develop Dec 15, 2016
@livc livc deleted the con branch December 15, 2016 09:55
zhhsplendid pushed a commit to zhhsplendid/Paddle that referenced this pull request Sep 25, 2019
* modified lrn formula

* modified design idea

* Update fluid_design_idea.md

* Update fluid_design_idea.md
wangxicoding pushed a commit to wangxicoding/Paddle that referenced this pull request Dec 9, 2021
Co-authored-by: smallv0221 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

汉化工作--contribute_to_paddle

3 participants