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/incubator-dolphinscheduler-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new ecc831f Automated deployment: Mon Jan 13 09:46:53 UTC 2020
a74a8fbc75bfb09dd6aa4cbd848a1d770d0ebb56
ecc831f is described below
commit ecc831f782fa1a71036ed63a2fa072d4ac444122
Author: dailidong <[email protected]>
AuthorDate: Mon Jan 13 09:46:54 2020 +0000
Automated deployment: Mon Jan 13 09:46:53 UTC 2020
a74a8fbc75bfb09dd6aa4cbd848a1d770d0ebb56
---
en-us/docs/development/submit-code.html | 82 ++++++++++++++++++++++++++++++++-
en-us/docs/development/submit-code.json | 2 +-
2 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/en-us/docs/development/submit-code.html
b/en-us/docs/development/submit-code.html
index 1cdf5e3..2d3b203 100644
--- a/en-us/docs/development/submit-code.html
+++ b/en-us/docs/development/submit-code.html
@@ -13,7 +13,87 @@
</head>
<body>
<div id="root"><div class="documentation-page"
data-reactroot=""><header class="header-container header-container-normal"><div
class="header-body"><a href="/en-us/index.html"><img class="logo"
src="/img/hlogo_colorful.svg"/></a><div class="search search-normal"><span
class="icon-search"></span></div><span class="language-switch
language-switch-normal">中</span><div class="header-menu"><img
class="header-menu-toggle" src="/img/system/menu_gray.png"/><div><ul
class="ant-menu blackClass ant [...]
-<p>TODO</p>
+<h4>Submit code process</h4>
+<ul>
+<li>
+<p>First from the remote repository * https: <a
href="//github.com/apache/incubator-dolphinscheduler.git*">//github.com/apache/incubator-dolphinscheduler.git*</a>
fork a copy of the code into your own repository</p>
+</li>
+<li>
+<p>There are currently three branches in the remote repository:</p>
+</li>
+</ul>
+<p>* master normal delivery branch
+After the stable release, merge the code from the stable branch into the
master.
+
+* dev daily development branch
+Every day dev development branch, newly submitted code can pull request to
this branch.</p>
+<ul>
+<li>
+<p>Clone your repository to your local
+
+ <code>git clone
https://github.com/apache/incubator-dolphinscheduler.git</code></p>
+</li>
+<li>
+<p>Add remote repository address, named upstream</p>
+</li>
+</ul>
+<p><code>git remote add upstream
https://github.com/apache/incubator-dolphinscheduler.git</code></p>
+<ul>
+<li>View repository:</li>
+</ul>
+<p><code>git remote -v</code></p>
+<blockquote>
+<p>At this time, there will be two repositories: origin (your own repository)
and upstream (remote repository)</p>
+</blockquote>
+<ul>
+<li>
+<p>Get/Update remote repository code
+
+ <code>git fetch upstream</code></p>
+</li>
+<li>
+<p>Synchronize remote repository code to local repository</p>
+<pre><code>git checkout origin/dev
+git merge --no-ff upstream/dev
+</code></pre>
+</li>
+</ul>
+<p>If remote branch has a new branch such as <code>dev-1.0</code>, you need to
synchronize this branch to the local repository</p>
+<pre><code>git checkout -b dev-1.0 upstream/dev-1.0
+git push --set-upstream origin dev-1.0
+</code></pre>
+<ul>
+<li>
+<p>After modifying the code locally, submit it to your own repository:
+
+ <code>git commit -m 'commit content'</code>
+
+ <code>git push</code></p>
+</li>
+<li>
+<p>Submit changes to the remote repository</p>
+</li>
+<li>
+<p>On the github page, click New pull request.</p>
+<p align = "center">
+<img src =
"http://geek.analysys.cn/static/upload/221/2019-04-02/90f3abbf-70ef-4334-b8d6-9014c9cf4c7f.png"
width = "60%" />
+</ p>
+</li>
+<li>
+<p>Select the modified local branch and the branch you want to merge with the
past, Create pull request.</p>
+</li>
+</ul>
+<p align = "center">
+<img src =
"http://geek.analysys.cn/static/upload/221/2019-04-02/fe7eecfe-2720-4736-951b-b3387cf1ae41.png"
width = "60%" />
+</ p>
+<ul>
+<li>
+<p>Then the community Committers will do CodeReview, and then he will discuss
some details (including design, implementation, performance, etc.) with you.
When everyone on the team is satisfied with this modification, the commit will
be merged into the dev branch</p>
+</li>
+<li>
+<p>Finally, congratulations, you have become an official contributor to
dolphinscheduler!</p>
+</li>
+</ul>
</div></section><footer class="footer-container"><div class="footer-body"><img
src="/img/ds_gray.svg"/><div class="cols-container"><div class="col
col-12"><h3>Disclaimer</h3><p>Apache DolphinScheduler (incubating) is an effort
undergoing incubation at The Apache Software Foundation (ASF), sponsored by
Incubator.
Incubation is required of all newly accepted projects until a further review
indicates
that the infrastructure, communications, and decision making process have
stabilized in a manner consistent with other successful ASF projects.
diff --git a/en-us/docs/development/submit-code.json
b/en-us/docs/development/submit-code.json
index 58b91f1..3656276 100644
--- a/en-us/docs/development/submit-code.json
+++ b/en-us/docs/development/submit-code.json
@@ -1,6 +1,6 @@
{
"filename": "submit-code.md",
- "__html": "<h4>how to submit code</h4>\n<p>TODO</p>\n",
+ "__html": "<h4>how to submit code</h4>\n<h4>Submit code
process</h4>\n<ul>\n<li>\n<p>First from the remote repository * https: <a
href=\"//github.com/apache/incubator-dolphinscheduler.git*\">//github.com/apache/incubator-dolphinscheduler.git*</a>
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</li>\n</ul>\n<p>*
master normal delivery branch\nAfter the stable release, merge the
code from t [...]
"link": "/en-us/docs/development/submit-code.html",
"meta": {}
}
\ No newline at end of file