This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 614b948 Automated deployment: fbfda5247b1438aa679f49892ed1756764621da1
614b948 is described below
commit 614b948730584a14b769c911056fe168218e67d0
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Mar 5 07:04:30 2022 +0000
Automated deployment: fbfda5247b1438aa679f49892ed1756764621da1
---
en-us/community/development/submit-code.html | 10 ++++++++--
en-us/community/development/submit-code.json | 2 +-
zh-cn/community/development/submit-code.html | 10 ++++++++--
zh-cn/community/development/submit-code.json | 2 +-
4 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/en-us/community/development/submit-code.html
b/en-us/community/development/submit-code.html
index a95934a..d46039a 100644
--- a/en-us/community/development/submit-code.html
+++ b/en-us/community/development/submit-code.html
@@ -57,10 +57,16 @@ git merge --no-ff upstream/dev
git push --set-upstream origin dev-1.0
</code></pre>
<ul>
-<li>After modifying the code locally, submit it to your own repository:</li>
+<li>Create new branch</li>
+</ul>
+<pre><code>git checkout -b xxx origin/dev
+</code></pre>
+<p>Make sure that the branch <code>xxx</code> is building successfully on the
latest code of the official dev branch</p>
+<ul>
+<li>After modifying the code locally in the new branch, submit it to your own
repository:</li>
</ul>
<p><code>git commit -m 'commit content'</code></p>
-<p><code>git push</code></p>
+<p><code>git push origin xxx --set-upstream</code></p>
<ul>
<li>
<p>Submit changes to the remote repository</p>
diff --git a/en-us/community/development/submit-code.json
b/en-us/community/development/submit-code.json
index d677c84..e74ce6e 100644
--- a/en-us/community/development/submit-code.json
+++ b/en-us/community/development/submit-code.json
@@ -1,6 +1,6 @@
{
"filename": "submit-code.md",
- "__html": "<h1>Submit Code</h1>\n<ul>\n<li>\n<p>First from the remote
repository <em><a
href=\"https://github.com/apache/dolphinscheduler.git\";>https://github.com/apache/dolphinscheduler.git</a></em>
fork a copy of the code into your own repository</p>\n</li>\n<li>\n<p>There
are currently three branches in the remote repository:</p>\n<ul>\n<li>master
normal delivery branch\nAfter the stable release, merge the code from
the stable branch into the master.</li>\n<li>dev [...]
+ "__html": "<h1>Submit Code</h1>\n<ul>\n<li>\n<p>First from the remote
repository <em><a
href=\"https://github.com/apache/dolphinscheduler.git\";>https://github.com/apache/dolphinscheduler.git</a></em>
fork a copy of the code into your own repository</p>\n</li>\n<li>\n<p>There
are currently three branches in the remote repository:</p>\n<ul>\n<li>master
normal delivery branch\nAfter the stable release, merge the code from
the stable branch into the master.</li>\n<li>dev [...]
"link": "/dist/en-us/community/development/submit-code.html",
"meta": {}
}
\ No newline at end of file
diff --git a/zh-cn/community/development/submit-code.html
b/zh-cn/community/development/submit-code.html
index 6586c8f..f6972e4 100644
--- a/zh-cn/community/development/submit-code.html
+++ b/zh-cn/community/development/submit-code.html
@@ -65,10 +65,16 @@
git push --set-upstream origin dev-1.0
</code></pre>
<ul>
+<li>新建分支</li>
+</ul>
+<pre><code>git checkout -b xxx origin/dev
+</code></pre>
+<p>确保分支<code>xxx</code>是基于官方dev分支的最新代码</p>
+<ul>
<li>
-<p>在本地修改代码以后，提交到自己仓库：</p>
+<p>在新建的分支上本地修改代码以后，提交到自己仓库：</p>
<p><code>git commit -m 'commit content'</code></p>
-<p><code>git push</code></p>
+<p><code>git push origin xxx --set-upstream</code></p>
</li>
<li>
<p>将修改提交到远端仓库</p>
diff --git a/zh-cn/community/development/submit-code.json
b/zh-cn/community/development/submit-code.json
index 56c7059..5482a1c 100644
--- a/zh-cn/community/development/submit-code.json
+++ b/zh-cn/community/development/submit-code.json
@@ -1,6 +1,6 @@
{
"filename": "submit-code.md",
- "__html": "<h1>提交代码</h1>\n<ul>\n<li>\n<p>首先从远端仓库<em><a
href=\"https://github.com/apache/dolphinscheduler.git\";>https://github.com/apache/dolphinscheduler.git</a></em>
fork一份代码到自己的仓库中</p>\n</li>\n<li>\n<p>远端仓库中目前有三个分支：</p>\n<ul>\n<li>\n<p>master
正常交付分支\n发布稳定版本以后，将稳定版本分支的代码合并到master上。</p>\n</li>\n<li>\n<p>dev
日常开发分支\n日常dev开发分支，新提交的代码都可以pull
request到这个分支上。</p>\n</li>\n<li>\n<p>branch-1.0.0
发布版本分支\n发布版本分支，后续会有2.0...等版本分支。</p>\n</li>\n</ul>\n</li>\n<li>\n<p>把自己仓库clone到本地</p>\n<p><code>gi
[...]
+ "__html": "<h1>提交代码</h1>\n<ul>\n<li>\n<p>首先从远端仓库<em><a
href=\"https://github.com/apache/dolphinscheduler.git\";>https://github.com/apache/dolphinscheduler.git</a></em>
fork一份代码到自己的仓库中</p>\n</li>\n<li>\n<p>远端仓库中目前有三个分支：</p>\n<ul>\n<li>\n<p>master
正常交付分支\n发布稳定版本以后，将稳定版本分支的代码合并到master上。</p>\n</li>\n<li>\n<p>dev
日常开发分支\n日常dev开发分支，新提交的代码都可以pull
request到这个分支上。</p>\n</li>\n<li>\n<p>branch-1.0.0
发布版本分支\n发布版本分支，后续会有2.0...等版本分支。</p>\n</li>\n</ul>\n</li>\n<li>\n<p>把自己仓库clone到本地</p>\n<p><code>gi
[...]
"link": "/dist/zh-cn/community/development/submit-code.html",
"meta": {}
}
\ No newline at end of file
