[incubator-shenyu-website] branch main updated: Add subsequent pull request submission guide (#585)

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu-website.git


The following commit(s) were added to refs/heads/main by this push:
     new 1f9cb0c270 Add subsequent pull request submission guide (#585)
1f9cb0c270 is described below

commit 1f9cb0c270e94dbc5d6a6b244e482fae79651cf9
Author: Kunshuai Zhu <jo...@gmail.com>
AuthorDate: Wed Jun 1 19:19:41 2022 +0800

    Add subsequent pull request submission guide (#585)
    
    Signed-off-by: zhukunshuai <jo...@gmail.com>
---
 community/3-contributor.md                         | 32 ++++++++++++++++++++--
 .../current/3-contributor.md                       | 32 ++++++++++++++++++++--
 2 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/community/3-contributor.md b/community/3-contributor.md
index 77410785d0..80dae2ce0b 100644
--- a/community/3-contributor.md
+++ b/community/3-contributor.md
@@ -78,9 +78,9 @@ At the same time, you can also participate in the writing of our [blog](../blog)
 
 If you are a student, you are also very welcome to apply for the topic of Apache ShenYu in open source internship activities such as GSoC. You can click the [link](https://community.apache.org/gsoc.html) to view the Apache Software Foundation Introduction to GSoC. You can also check Apache ShenYu's previous or ongoing GSoC issues through this [link](https://github.com/apache/incubator-shenyu/issues?q=is%3Aopen+is%3Aissue+label%3Agsoc)!
 
-### Submit Pull Request
+### Submit Pull Request for the first time
 
-First you need to fork your target repository.
+If you are submitting a Pr for the first time, first you need to Fork the target repository. (If it has been forked, then no fork is required)
 
 ![fork](/img/community/fork.png)
 
@@ -118,6 +118,34 @@ Then you can initiate a new PR (Pull Request) on GitHub.
 
 Please note that the title of the PR needs to conform to our [spec](../issue-pr), and write the necessary description in the PR to facilitate code review by Committers and other contributors.
 
+### Subsequent Pull Request submission
+
+#### Update master branch code
+
+First, switch to the master branch
+
+```shell
+git checkout master #May also be the main branch
+````
+
+Bind the upstream warehouse (you only need to bind it once), here is the main warehouse of shenyu as an example
+
+```shell
+git remote add upstream https://github.com/apache/incubator-shenyu.git
+````
+
+Pull remote code
+
+```shell
+git pull upstream master
+````
+
+#### New development branch for developing
+
+Then create a new development branch for development, submission and push. The process is the same as submitting Pull Request for the first time.
+
+In order to prevent the confusion of the master branch, it is recommended that the master branch be used to maintain synchronization with the upstream, and not develop and submit code on the master branch.
+
 ### Wait for the code to be merged
 
 After submitting the PR, the Committer or the community's friends will review the code you submitted (Code Review), and will propose some modification suggestions or conduct some discussions. Please pay attention to your PR in time.
diff --git a/i18n/zh/docusaurus-plugin-content-docs-community/current/3-contributor.md b/i18n/zh/docusaurus-plugin-content-docs-community/current/3-contributor.md
index 132082dcf2..c9ae67caae 100755
--- a/i18n/zh/docusaurus-plugin-content-docs-community/current/3-contributor.md
+++ b/i18n/zh/docusaurus-plugin-content-docs-community/current/3-contributor.md
@@ -78,9 +78,9 @@ Apache ShenYu 一般是在 GitHub 上进行协作开发。目前有以下几个
 
 如果您是学生，那么也非常欢迎在 GSoC 等开源实习活动中申请 Apache ShenYu 的议题，您可以点击 [链接](https://community.apache.org/gsoc.html) 来查看 Apache 软件基金会对 GSoC 的介绍。您也可以通过这个 [链接](https://github.com/apache/incubator-shenyu/issues?q=is%3Aopen+is%3Aissue+label%3Agsoc) 来查看 Apache ShenYu 往年或者正在进行中的 GSoC 议题！
 
-### 提交Pull Request
+### 第一次提交 Pull Request
 
-首先您需要 Fork 目标仓库。
+如果您是第一次提交 Pr，首先您需要 Fork 目标仓库。（如果已经 Fork 则不需要再 Fork）
 
 ![fork](/img/community/fork.png)
 
@@ -118,6 +118,34 @@ git push origin a-dev-branch
 
 请注意 PR 的标题需要符合我们的[规范](../issue-pr)，并且在 PR 中写上必要的说明，来方便 Committer 和其他贡献者进行代码审查。
 
+### 后续提交 Pull Request
+
+#### 更新主分支代码
+
+首先，切换到主分支
+
+```shell
+git checkout master #也可能是main分支
+```
+
+绑定上游仓库（只需要绑定一次），这里以 shenyu 的主仓库为例
+
+```shell
+git remote add upstream https://github.com/apache/incubator-shenyu.git
+```
+
+拉取远程代码
+
+```shell
+git pull upstream master
+```
+
+#### 新建开发分支，进行开发
+
+接着新建开发分支进行开发、提交和推送，流程与第一次提交 Pull Request 一样。
+
+为了防止 master 分支混乱，建议 master 分支用于保持跟上游的同步，不在 master 分支进行开发、提交代码。
+
 ### 等待代码被合并
 
 在提交了 PR 后，Committer 或者社区的小伙伴们会对您提交的代码进行审查（Code Review），会提出一些修改建议，或者是进行一些讨论，请及时关注您的PR。