You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by gi...@apache.org on 2020/01/13 11:11:56 UTC
[incubator-dolphinscheduler-website] branch asf-site updated:
Automated deployment: Mon Jan 13 11:04:27 UTC 2020
7da78afeadf2fabb96f0febc0059c3f661abe9d3
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 6ee170b Automated deployment: Mon Jan 13 11:04:27 UTC 2020 7da78afeadf2fabb96f0febc0059c3f661abe9d3
6ee170b is described below
commit 6ee170b3dded6ca025652f31d83dfd6c40f7e074
Author: dailidong <da...@users.noreply.github.com>
AuthorDate: Mon Jan 13 11:04:28 2020 +0000
Automated deployment: Mon Jan 13 11:04:27 UTC 2020 7da78afeadf2fabb96f0febc0059c3f661abe9d3
---
en-us/docs/development/submit-code.html | 53 +++++++++++++++------------------
en-us/docs/development/submit-code.json | 2 +-
2 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/en-us/docs/development/submit-code.html b/en-us/docs/development/submit-code.html
index b479691..19413d1 100644
--- a/en-us/docs/development/submit-code.html
+++ b/en-us/docs/development/submit-code.html
@@ -12,63 +12,58 @@
<link rel="stylesheet" href="/build/documentation.css" />
</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 [...]
+ <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 [...]
<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>
+<p>First from the remote repository <em><a href="https://github.com/apache/incubator-dolphinscheduler.git">https://github.com/apache/incubator-dolphinscheduler.git</a></em> 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>master normal delivery branch
+After the stable release, merge the code from the stable branch into the master.</li>
+<li>dev daily development branch
+Every day dev development branch, newly submitted code can pull request to this branch.</li>
+</ul>
+</li>
<li>
<p>Clone your repository to your local
-
- <code>git clone https://github.com/apache/incubator-dolphinscheduler.git</code></p>
+<code>git clone https://github.com/apache/incubator-dolphinscheduler.git</code></p>
</li>
<li>
-<p>Add remote repository address, named upstream</p>
+<p>Add remote repository address, named upstream
+<code>git remote add upstream https://github.com/apache/incubator-dolphinscheduler.git</code></p>
+</li>
+<li>
+<p>View repository
+ <code>git remote -v</code></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>
+</li>
+</ul>
<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>After modifying the code locally, submit it to your own repository:</li>
+</ul>
+<p><code>git commit -m 'commit content'</code></p>
+<p><code>git push</code></p>
+<ul>
<li>
<p>Submit changes to the remote repository</p>
</li>
@@ -76,7 +71,7 @@ git push --set-upstream origin dev-1.0
<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>
+</p>
</li>
<li>
<p>Select the modified local branch and the branch you want to merge with the past, Create pull request.</p>
@@ -84,7 +79,7 @@ git push --set-upstream origin dev-1.0
</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>
+</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>
diff --git a/en-us/docs/development/submit-code.json b/en-us/docs/development/submit-code.json
index 1c2e909..64ac399 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<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 the stable branch into the mast [...]
+ "__html": "<h4>How to submit</h4>\n<ul>\n<li>\n<p>First from the remote repository <em><a href=\"https://github.com/apache/incubator-dolphinscheduler.git\">https://github.com/apache/incubator-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.< [...]
"link": "/en-us/docs/development/submit-code.html",
"meta": {}
}
\ No newline at end of file