You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/07/11 04:17:21 UTC
[doris] branch master updated: [docs] how-to-contribute remove incubator (#10730)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new d6e6aae6c6 [docs] how-to-contribute remove incubator (#10730)
d6e6aae6c6 is described below
commit d6e6aae6c6c1db69dd28664db9e74f4b0c14e9ed
Author: jiafeng.zhang <zh...@gmail.com>
AuthorDate: Mon Jul 11 12:17:16 2022 +0800
[docs] how-to-contribute remove incubator (#10730)
---
docs/.vuepress/public/images/create-pr.png | Bin 159594 -> 394922 bytes
docs/.vuepress/public/images/create-pr3.png | Bin 176477 -> 351590 bytes
docs/.vuepress/public/images/fork-repo.png | Bin 185675 -> 585255 bytes
docs/.vuepress/public/images/new-pr.png | Bin 180263 -> 443729 bytes
.../en/community/how-to-contribute/pull-request.md | 22 +++++-----
.../community/how-to-contribute/pull-request.md | 46 ++++++++++-----------
6 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/docs/.vuepress/public/images/create-pr.png b/docs/.vuepress/public/images/create-pr.png
index acd63f6862..23c0ad026c 100644
Binary files a/docs/.vuepress/public/images/create-pr.png and b/docs/.vuepress/public/images/create-pr.png differ
diff --git a/docs/.vuepress/public/images/create-pr3.png b/docs/.vuepress/public/images/create-pr3.png
index 13ab187912..6dab6b0fbb 100644
Binary files a/docs/.vuepress/public/images/create-pr3.png and b/docs/.vuepress/public/images/create-pr3.png differ
diff --git a/docs/.vuepress/public/images/fork-repo.png b/docs/.vuepress/public/images/fork-repo.png
index c5468c7a70..76426fe7c5 100644
Binary files a/docs/.vuepress/public/images/fork-repo.png and b/docs/.vuepress/public/images/fork-repo.png differ
diff --git a/docs/.vuepress/public/images/new-pr.png b/docs/.vuepress/public/images/new-pr.png
index 16d5ecf8c1..0702c90c8c 100644
Binary files a/docs/.vuepress/public/images/new-pr.png and b/docs/.vuepress/public/images/new-pr.png differ
diff --git a/docs/en/community/how-to-contribute/pull-request.md b/docs/en/community/how-to-contribute/pull-request.md
index 38d40a7e26..45872652e2 100644
--- a/docs/en/community/how-to-contribute/pull-request.md
+++ b/docs/en/community/how-to-contribute/pull-request.md
@@ -42,7 +42,7 @@ Go to the [github page](https://github.com/apache/incubator-doris) of apache/inc
git clone https://github.com/<your_github_name>/incubator-doris.git
```
-Note: Please replace your GitHub name with your yourgithubname\\\\\\\\\\\\\\.
+Note: Please replace your GitHub name with your yourgithubname.
When clone is completed, origin defaults to the remote fork address on github.
@@ -50,17 +50,17 @@ When clone is completed, origin defaults to the remote fork address on github.
```
cd incubator-doris
-git remote add upstream https://github.com/apache/incubator-doris.git
+git remote add upstream https://github.com/apache/doris.git
```
#### (3) Check remote warehouse settings:
```
git remote -v
-origin https://github.com/<your_github_name>/incubator-doris.git (fetch)
-origin https://github.com/<your_github_name>/incubator-doris.git (push)
-upstream https://github.com/apache/incubator-doris.git (fetch)
-upstream https://github.com/apache/incubator-doris.git (push)
+origin https://github.com/<your_github_name>/doris.git (fetch)
+origin https://github.com/<your_github_name>/doris.git (push)
+upstream https://github.com/apache/doris.git (fetch)
+upstream https://github.com/apache/doris.git (push)
```
#### (4) New branches to modify them:
@@ -85,7 +85,7 @@ For more git usage, please visit: [git usage](https://www.atlassian.com/git/tuto
### 3. Create PR
#### (1) New PR
-Switch to your GitHub page in the browser, switch to the submitted branch yourbranchname\\ and click the `New pull request` button to create it, as shown in the following figure:
+Switch to your GitHub page in the browser, switch to the submitted branch yourbranchname\\ and click the `Compare & pull request` button to create it, as shown in the following figure:
@@ -173,7 +173,7 @@ remote: Compressing objects: 100% (68/68), done.
remote: Total 141 (delta 75), reused 108 (delta 48)
Receiving objects: 100% (141/141), 58.28 KiB, done.
Resolving deltas: 100% (75/75), completed with 43 local objects.
-From https://github.com/apache/incubator-doris
+From https://github.com/apache/doris
9c36200..0c4edc2 master -> upstream/master
```
@@ -209,7 +209,7 @@ Compressing objects: 100% (41/41), done.
Writing objects: 100% (141/141), 56.66 KiB, done.
Total 141 (delta 76), reused 140 (delta 75)
remote: Resolving deltas: 100% (76/76), completed with 44 local objects.
-To https://lide-reed:fc35ff925bd8fd6629be3f6412bacee99d4e5f97@github.com/lide-reed/incubator-doris.git
+To https://lide-reed:xxxx@github.com/lide-reed/doris.git
9c36200..0c4edc2 master -> master
```
@@ -250,9 +250,9 @@ Total 6 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
remote:
remote: Create a pull request for 'my_branch' on GitHub by visiting:
-remote: https://github.com/lide-reed/incubator-doris/pull/new/my_branch
+remote: https://github.com/lide-reed/doris/pull/new/my_branch
remote:
-To https://lide-reed:fc35ff925bd8fd6629be3f6412bacee99d4e5f97@github.com/lide-reed/incubator-doris.git
+To https://lide-reed:xxxx@github.com/lide-reed/doris.git
* [new branch] my_branch -> my_branch
```
diff --git a/docs/zh-CN/community/how-to-contribute/pull-request.md b/docs/zh-CN/community/how-to-contribute/pull-request.md
index c1022afbfc..ec4ff3d10a 100644
--- a/docs/zh-CN/community/how-to-contribute/pull-request.md
+++ b/docs/zh-CN/community/how-to-contribute/pull-request.md
@@ -30,7 +30,7 @@ under the License.
### 1. Fork仓库
-进入 apache/incubator-doris 的 [github 页面](https://github.com/apache/incubator-doris) ，点击右上角按钮 `Fork` 进行 Fork。
+进入 apache/doris 的 [github 页面](https://github.com/apache/doris) ，点击右上角按钮 `Fork` 进行 Fork。
@@ -39,28 +39,28 @@ under the License.
#### （1）将代码克隆到本地：
```
-git clone https://github.com/<your_github_name>/incubator-doris.git
+git clone https://github.com/<your_github_name>/doris.git
```
注意：请将 \<your\_github\_name\> 替换为您的 github 名字。
-
+
clone 完成后，origin 会默认指向 github 上的远程 fork 地址。
#### （2）将 apache/incubator-doris 添加为本地仓库的远程分支 upstream：
```
cd incubator-doris
-git remote add upstream https://github.com/apache/incubator-doris.git
+git remote add upstream https://github.com/apache/doris.git
```
#### （3）检查远程仓库设置：
```
git remote -v
-origin https://github.com/<your_github_name>/incubator-doris.git (fetch)
-origin https://github.com/<your_github_name>/incubator-doris.git (push)
-upstream https://github.com/apache/incubator-doris.git (fetch)
-upstream https://github.com/apache/incubator-doris.git (push)
+origin https://github.com/<your_github_name>/doris.git (fetch)
+origin https://github.com/<your_github_name>/doris.git (push)
+upstream https://github.com/apache/doris.git (fetch)
+upstream https://github.com/apache/doris.git (push)
```
#### （4）新建分支以便在分支上做修改：
@@ -85,14 +85,14 @@ git push origin <your_branch_name>
### 3. 创建PR
#### （1）新建 PR
-在浏览器切换到自己的 github 页面，切换分支到提交的分支 \<your\_branch\_name\> ，点击 `New pull request` 按钮进行创建，如下图所示：
+在浏览器切换到自己的 github 页面，切换分支到提交的分支 \<your\_branch\_name\> ，点击 `Compare & pull request` 按钮进行创建，如下图所示：
#### （2）准备分支
这时候，会出现 `Create pull request` 按钮，如果没有请检查是否正确选择了分支，也可以点击 “compare across forks” 重新选择 repo 和分支。
-
+
#### （3）填写 Commit Message
这里请填写 comment 的总结和详细内容，然后点击 `Create pull request` 进行创建。
@@ -127,38 +127,38 @@ git push origin <your_branch_name>
```
git checkout master
```
-
+
#### （2）同步远端主分支至本地
```
git pull upstream master
```
-
+
#### （3）切换回刚才的分支（假设分支名为fix）
```
git checkout fix
```
-
+
#### （4）进行rebase
-
+
```
git rebase -i master
```
-
+
此时会弹出修改记录的文件，一般直接保存即可。然后会提示哪些文件出现了冲突，此时可打开冲突文件对冲突部分进行修改，将提示的所有冲突文件的冲突都解决后，执行
-
+
```
git add .
git rebase --continue
```
-
+
依此往复，直至屏幕出现类似 *rebase successful* 字样即可，此时您可以进行往提交PR的分支进行更新：
-
+
```
git push -f origin fix
```
-
+
### 5. 一个例子
#### （1）对于已经配置好 upstream 的本地分支 fetch 到最新代码
@@ -173,7 +173,7 @@ remote: Compressing objects: 100% (68/68), done.
remote: Total 141 (delta 75), reused 108 (delta 48)
Receiving objects: 100% (141/141), 58.28 KiB, done.
Resolving deltas: 100% (75/75), completed with 43 local objects.
-From https://github.com/apache/incubator-doris
+From https://github.com/apache/doris
9c36200..0c4edc2 master -> upstream/master
```
@@ -209,7 +209,7 @@ Compressing objects: 100% (41/41), done.
Writing objects: 100% (141/141), 56.66 KiB, done.
Total 141 (delta 76), reused 140 (delta 75)
remote: Resolving deltas: 100% (76/76), completed with 44 local objects.
-To https://lide-reed:fc35ff925bd8fd6629be3f6412bacee99d4e5f97@github.com/lide-reed/incubator-doris.git
+To https://lide-reed:xxxx@github.com/lide-reed/doris.git
9c36200..0c4edc2 master -> master
```
@@ -250,9 +250,9 @@ Total 6 (delta 4), reused 0 (delta 0)
remote: Resolving deltas: 100% (4/4), completed with 4 local objects.
remote:
remote: Create a pull request for 'my_branch' on GitHub by visiting:
-remote: https://github.com/lide-reed/incubator-doris/pull/new/my_branch
+remote: https://github.com/lide-reed/doris/pull/new/my_branch
remote:
-To https://lide-reed:fc35ff925bd8fd6629be3f6412bacee99d4e5f97@github.com/lide-reed/incubator-doris.git
+To https://lide-reed:xxxx@github.com/lide-reed/doris.git
* [new branch] my_branch -> my_branch
```
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org