This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git
commit d18102f3cab6ffc1d69bef934f734662531743bd Author: Willem Jiang <[email protected]> AuthorDate: Fri Dec 29 18:40:15 2017 +0800 Publish the website --- .../setup-develop-environment/index.html | 83 +++++++------- content/developers/submit-codes/index.html | 121 ++++++++++----------- content/feed.xml | 2 +- 3 files changed, 104 insertions(+), 102 deletions(-) diff --git a/content/developers/setup-develop-environment/index.html b/content/developers/setup-develop-environment/index.html index ce1030e..e209912 100644 --- a/content/developers/setup-develop-environment/index.html +++ b/content/developers/setup-develop-environment/index.html @@ -19,12 +19,12 @@ -<title>开发环境准备 - Apache ServiceComb (incubating)</title> +<title>Setup Developing Environment - Apache ServiceComb (incubating)</title> -<meta name="description" content="开发环境准备"> +<meta name="description" content="setup developing environment"> @@ -33,7 +33,7 @@ <meta property="og:locale" content="en"> <meta property="og:site_name" content="Apache ServiceComb (incubating)"> -<meta property="og:title" content="开发环境准备"> +<meta property="og:title" content="Setup Developing Environment"> <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/developers/setup-develop-environment/";> @@ -41,13 +41,13 @@ - <meta property="og:description" content="开发环境准备"> + <meta property="og:description" content="setup developing environment"> <meta name="twitter:site" content="@ServiceComb"> - <meta name="twitter:title" content="开发环境准备"> - <meta name="twitter:description" content="开发环境准备"> + <meta name="twitter:title" content="Setup Developing Environment"> + <meta name="twitter:description" content="setup developing environment"> <meta name="twitter:url" content=""> @@ -300,8 +300,8 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> - <meta itemprop="headline" content="开发环境准备"> - <meta itemprop="description" content="开发环境准备"> + <meta itemprop="headline" content="Setup Developing Environment"> + <meta itemprop="description" content="setup developing environment"> <meta itemprop="dateModified" content="June 24, 2017"> @@ -309,7 +309,7 @@ <header> - <h1 class="page__title" itemprop="headline">开发环境准备 + <h1 class="page__title" itemprop="headline">Setup Developing Environment </h1> </header> @@ -317,32 +317,35 @@ <section class="page__content" itemprop="text"> - <h2 id="基本环境准备">基本环境准备</h2> -<p>在您开始前，请确保以下应用已安装：</p> + <h2 id="install-required-tools">Install required tools</h2> +<p>Before you start, make sure you have the following tools installed:</p> <ul> - <li><strong>Git</strong>，安装详情可参考<a href="https://git-scm.com/book/zh/v2/%E8%B5%B7%E6%AD%A5-%E5%AE%89%E8%A3%85-Git"; target="_blank">Git安装教程</a></li> - <li><strong>JDK 1.8</strong>，安装详情可参考<a href="https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html"; target="_blank">JDK安装教程</a></li> - <li><strong>Maven 3.x</strong>，安装详情可参考<a href="https://maven.apache.org/install.html"; target="_blank">Maven安装教程</a></li> - <li><strong>Docker</strong>，安装详情可参考<a href="https://docs.docker.com/engine/installation/"; target="_blank">Docker 安装教程</a></li> - <li><strong>Service Center</strong>, 安装详情可参考<a href="/users/setup-environment/#运行service-center">Service Center安装教程</a></li> - <li><strong>IntelliJ Idea IDE</strong>(可选，您可以使用其他心仪的IDE，如eclipse)，安装详情可参考<a href="https://www.jetbrains.com/help/idea/installing-and-launching.html"; target="_blank">IntelliJ安装教程</a></li> + <li><strong>Git</strong>，please refer to <a href="https://git-scm.com/book/en/v2/Getting-Started-Installing-Git"; target="_blank">Install Git</a></li> + <li><strong>JDK 1.8</strong>，please refer to <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html"; target="_blank">Install JDK</a></li> + <li><strong>Maven 3.x</strong>，please refer to <a href="https://maven.apache.org/install.html"; target="_blank">Install Maven</a></li> + <li><strong>Docker</strong>，please refer to <a href="https://docs.docker.com/engine/installation/"; target="_blank">Install Docker</a></li> + <li><strong>Service Center</strong>, please refer to <a href="/users/setup-environment/#运行service-center">Install Service Center</a></li> + <li><strong>IntelliJ Idea IDE</strong>(optional, you can use any IDE you like, e.g. eclipse), please refer to<a href="https://www.jetbrains.com/help/idea/installing-and-launching.html"; target="_blank">Install IntelliJ</a></li> </ul> -<h2 id="git配置">Git配置</h2> +<h2 id="setup-git">Setup git</h2> <ol> - <li>注册Github。由于ServiceComb的代码是托管在Github上的，所以您需要有一个Github的帐号，可前往 <a href="https://github.com/join?source=header-home";>https://github.com/join?source=header-home</a> 进行注册，如您已有Github帐号，则可跳过此步。注册完成后直接在 <a href="https://github.com/login?return_to=%2Fjoin%3Fsource%3Dheader-home";>https://github.com/login?return_to=%2Fjoin%3Fsource%3Dheader-home</a> 进行登录即可。</li> <li> - <p>配置Git。主要配置Git的个人信息和设置免密码提交代码。个人信息可通过以下指令进行配置：</p> + <p>Get a Github account. The ServiceComb projects is hosted on Github, so you will need a Github account. You can goto <a href="https://github.com/join?source=header-home";>https://github.com/join?source=header-home</a> for signup. Skip this if you already own an Github account. You can login on <a href="https://github.com/login?return_to=%2Fjoin%3Fsource%3Dheader-home";>https://github.com/login?return_to=%2Fjoin%3Fsource%3Dheader-home</a> after you finished the signup.</p> + </li> + <li> + <p>Configure Git. Configure personal information and setup git for push without username/password. +Configure personal information:</p> <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git config --global user.name <your-user-name> git config --global user.email <your-email-address> </code></pre> </div> - <p>其中，请将<your-user-name>和<your-email-address>替换为您在Github上注册用到的用户名和邮箱信息。设置免密码提交代码可参考<a href="https://stackoverflow.com/a/8588786"; target="_blank">Git免密码提交代码教程</a>。</p> + <p>Substitute <your-user-name>和<your-email-address> with your name and email. Refer<a href="https://stackoverflow.com/a/8588786"; target="_blank">Git push without username and password</a>to setup pushing without username/password.</p> </li> <li> - <p>获取项目代码。以 <a href="https://github.com/apache/incubator-servicecomb-java-chassis.git";>ServiceComb-Java-Chassis</a> 项目为例，可直接执行以下指令获取代码：</p> + <p>Get the source code. For example, to get <a href="https://github.com/apache/incubator-servicecomb-java-chassis.git";>ServiceComb-Java-Chassis</a>, execute the following command:</p> <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/apache/incubator-servicecomb-java-chassis.git </code></pre> @@ -350,10 +353,10 @@ git config --global user.email <your-email-address> </li> </ol> -<h2 id="ide-环境配置">IDE 环境配置</h2> -<p>现有支持Java开发的IDE很多，如Eclipse, IntelliJ IDEA和STS等。我们在此推荐使用IntelliJ IDEA，对于日常开发，其社区版的功能已经足够了。在安装完IntelliJ IDEA后，您可以根据<a href="https://www.jetbrains.com/help/idea/installing-and-launching.html#d325787e291";>初始化设置教程</a>对IntelliJ IDEA进行配置，随后可通过阅读<a href="https://www.jetbrains.com/help/idea/keyboard-shortcuts-you-cannot-miss.html";>必备快捷键</a>了解常用的快捷键。</p> +<h2 id="configure-ide">Configure IDE</h2> +<p>There are many Java IDEs around, like Eclipse, IntelliJ IDEA and STS, etc. We suggest to use IntelliJ IDEA, it’s community edition is good enough for daily usage. After you installed IntelliJ IDEA, follow <a href="https://www.jetbrains.com/help/idea/installing-and-launching.html#d325787e291";>Initial Setup</a> for basic configuration. For frequently used shortcuts, <a href="https://www.jetbrains.com/help/idea/keyboard-shortcuts-you-cannot-miss.html";>Cannot Miss Shortcuts</a></p> -<p>Java Chassis和Saga项目使用了<a href="https://github.com/google/styleguide";>Google Code Style</a>作为代码风格，配置文件可以在本项目 <code class="highlighter-rouge">etc</code> 目录下找到。其中，目录中也有Eclipse的代码风格，读者可以直接导入使用。</p> +<p>The Java Chassis and Saga project uses <a href="https://github.com/google/styleguide";>Google Code Style</a>. You can find the settings file under <code class="highlighter-rouge">etc</code> directory which can be imported to IDEA. There is also a settings file for Eclipse under the same directory.</p> <p><img src="/assets/images/intellij.code.style.3.png" alt="code style files" class="align-center" /></p> @@ -361,46 +364,48 @@ git config --global user.email <your-email-address> <nav class="toc"> <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> On This Page</h4></header> --> <ul class="toc__menu" id="markdown-toc"> - <li><a href="#基本环境准备" id="markdown-toc-基本环境准备">基本环境准备</a></li> - <li><a href="#git配置" id="markdown-toc-git配置">Git配置</a></li> - <li><a href="#ide-环境配置" id="markdown-toc-ide-环境配置">IDE 环境配置</a> <ul> - <li><a href="#intellij-idea-配置" id="markdown-toc-intellij-idea-配置">IntelliJ IDEA 配置</a></li> + <li><a href="#install-required-tools" id="markdown-toc-install-required-tools">Install required tools</a></li> + <li><a href="#setup-git" id="markdown-toc-setup-git">Setup git</a></li> + <li><a href="#configure-ide" id="markdown-toc-configure-ide">Configure IDE</a> <ul> + <li><a href="#intellij-idea-configuration" id="markdown-toc-intellij-idea-configuration">IntelliJ IDEA Configuration</a></li> </ul> </li> - <li><a href="#下一步" id="markdown-toc-下一步">下一步</a></li> + <li><a href="#next" id="markdown-toc-next">Next</a></li> </ul> </nav> </aside> -<h3 id="intellij-idea-配置">IntelliJ IDEA 配置</h3> -<p><a href="https://www.jetbrains.com/idea/download/";>IntelliJ IDEA</a>的配置方法如下</p> +<h3 id="intellij-idea-configuration">IntelliJ IDEA Configuration</h3> +<p>Configure <a href="https://www.jetbrains.com/idea/download/";>IntelliJ IDEA</a></p> <ol> <li> - <p>打开IntelliJ配置 + <p>Open IntelliJ Settings page <img src="/assets/images/intellij.code.style.4.png" alt="IntelliJ Settings" class="align-center" /></p> </li> <li> - <p>Import 配置文件 <code class="highlighter-rouge">etc/intellij-java-google-style.xml</code> + <p>Import the coding style settings file <code class="highlighter-rouge">etc/intellij-java-google-style.xml</code> <img src="/assets/images/intellij.code.style.1.png" alt="import code style" class="align-center" /></p> </li> <li> - <p>打开已修改而未提交的文件，并打开格式化文件对话框 + <p>Open a modified but uncommited file, then Choose [Code] > [Show Reformat File Dialog] <img src="/assets/images/intellij.code.style.5.png" alt="reformat file dialog" class="align-center" /></p> </li> <li> - <p>选择只格式化修改部分 + <p>Choose [Only VCS changed text], then click [Run] <img src="/assets/images/intellij.code.style.2.png" alt="reformat options" class="align-center" /></p> </li> </ol> -<p>配置完成后，后续按快捷键 (Ctrl+Alt+i) 格式化修改文件即可。更多关于IntelliJ的使用技巧可阅读<a href="https://www.jetbrains.com/help/idea/tutorials.html";>IntelliJ教程</a>。</p> +<p>Just run [Reformat code] (Ctrl+Alt+L) afterwards to format the code.</p> + +<p>For more IntelliJ usages, please check <a href="https://www.jetbrains.com/help/idea/tutorials.html";>IntelliJ tutorial</a>。</p> -<h2 id="下一步">下一步</h2> +<h2 id="next">Next</h2> <ul> - <li>阅读<a href="/developers/submit-codes/">代码提交指南</a></li> + <li>Read<a href="/developers/submit-codes/">Howto submit codes</a></li> </ul> diff --git a/content/developers/submit-codes/index.html b/content/developers/submit-codes/index.html index 83e8a35..d02bb63 100644 --- a/content/developers/submit-codes/index.html +++ b/content/developers/submit-codes/index.html @@ -19,12 +19,12 @@ -<title>代码提交指南 - Apache ServiceComb (incubating)</title> +<title>Howto Submit Code - Apache ServiceComb (incubating)</title> -<meta name="description" content="介绍如何向 ServiceComb 项目提交代码"> +<meta name="description" content="Howto submit code for SerivceComb"> @@ -33,7 +33,7 @@ <meta property="og:locale" content="en"> <meta property="og:site_name" content="Apache ServiceComb (incubating)"> -<meta property="og:title" content="代码提交指南"> +<meta property="og:title" content="Howto Submit Code"> <link rel="canonical" href="http://github.com/pages/apache/incubator-servicecomb-website/developers/submit-codes/";> @@ -41,13 +41,13 @@ - <meta property="og:description" content="介绍如何向 ServiceComb 项目提交代码"> + <meta property="og:description" content="Howto submit code for SerivceComb"> <meta name="twitter:site" content="@ServiceComb"> - <meta name="twitter:title" content="代码提交指南"> - <meta name="twitter:description" content="介绍如何向 ServiceComb 项目提交代码"> + <meta name="twitter:title" content="Howto Submit Code"> + <meta name="twitter:description" content="Howto submit code for SerivceComb"> <meta name="twitter:url" content=""> @@ -300,8 +300,8 @@ <article class="page" itemscope itemtype="http://schema.org/CreativeWork";> - <meta itemprop="headline" content="代码提交指南"> - <meta itemprop="description" content="介绍如何向 ServiceComb 项目提交代码"> + <meta itemprop="headline" content="Howto Submit Code"> + <meta itemprop="description" content="Howto submit code for SerivceComb"> <meta itemprop="dateModified" content="September 08, 2017"> @@ -309,7 +309,7 @@ <header> - <h1 class="page__title" itemprop="headline">代码提交指南 + <h1 class="page__title" itemprop="headline">Howto Submit Code </h1> </header> @@ -321,13 +321,13 @@ <nav class="toc"> <!-- <header><h4 class="nav__title"><i class="fa fa-file-text"></i> On This Page</h4></header> --> <ul class="toc__menu" id="markdown-toc"> - <li><a href="#贡献途径" id="markdown-toc-贡献途径">贡献途径</a></li> - <li><a href="#运行测试" id="markdown-toc-运行测试">运行测试</a></li> - <li><a href="#pr指南" id="markdown-toc-pr指南">PR指南</a> <ul> - <li><a href="#fork仓库" id="markdown-toc-fork仓库">Fork仓库</a></li> - <li><a href="#配置git和提交修改" id="markdown-toc-配置git和提交修改">配置git和提交修改</a></li> - <li><a href="#创建pr" id="markdown-toc-创建pr">创建PR</a></li> - <li><a href="#冲突解决" id="markdown-toc-冲突解决">冲突解决</a></li> + <li><a href="#contributing" id="markdown-toc-contributing">Contributing</a></li> + <li><a href="#run-tests" id="markdown-toc-run-tests">Run tests</a></li> + <li><a href="#how-to-submit-a-pr" id="markdown-toc-how-to-submit-a-pr">How to submit a PR</a> <ul> + <li><a href="#fork-repository" id="markdown-toc-fork-repository">Fork repository</a></li> + <li><a href="#setup-local-repository" id="markdown-toc-setup-local-repository">Setup local repository</a></li> + <li><a href="#create-pr" id="markdown-toc-create-pr">Create PR</a></li> + <li><a href="#resolve-conflicts" id="markdown-toc-resolve-conflicts">Resolve conflicts</a></li> </ul> </li> </ul> @@ -335,48 +335,47 @@ </nav> </aside> -<h2 id="贡献途径">贡献途径</h2> -<p> ServiceComb正在不断成长中，也希望能找到更多志同道合的同伴一起成长和进步。向ServiceComb 贡献的途径有多种：</p> +<h2 id="contributing">Contributing</h2> +<p>ServiceComb is still growing and we hope that more will join us to share this. There are many ways to contribute:</p> <ul> - <li>完善文档。完善网站上的文档或者项目中的介绍文档和API说明文档。其中，网站文档的完善可通过网站最底端的<strong>报告本网页问题</strong>或<strong>在Github上编辑此页</strong>对文档内容进行完善。</li> + <li>Improve documents. Help us improve the documents on this site or the API documentation. For the documents on this site, you can find links <strong>Report a Doc Issue</strong> or <strong>Edit This Page on Github</strong> to start.</li> <li> - <p>实现功能特性需求或修复BUG。项目的功能特性需求或者已发现但未修复的BUG都会在项目中的issue处看到，以<a href="https://github.com/apache/incubator-servicecomb-saga/issues";>Saga</a>项目为例，一般都会带有类似 <strong>enhancement</strong> 或类似 <strong>bug</strong> 的标签来说明这是功能需求还是BUG，读者可以结合自己的兴趣点来选择。此外，您也可以通过日常使用或阅读代码时发现BUG并以Issue的方式进行描述并针对该BUG提交PR，帮助我们进一步改进。同时，也欢迎您提出需求并在实现后提交PR。</p> + <p>Implement feature request or fix bugs. You can find all the feature request and bug reports on the projects’ issues pages. Take <a href="https://github.com/apache/incubator-servicecomb-saga/issues";>Saga</a> as an example, issues will be labeled as <strong>enhancement</strong> or <strong>bug</strong>, you can choose the ones you are interested in. Bug reports and new feature requests are also welcomed.</p> - <p><img src="/assets/images/find-features-by-example.png" alt="寻觅功能需求示例" class="align-center" /></p> + <p><img src="/assets/images/find-features-by-example.png" alt="Find Features" class="align-center" /></p> </li> </ul> -<h2 id="运行测试">运行测试</h2> -<p> 在您提交代码前，请先按照项目README中说明的自动测试部分对代码的功能性和实现上的正确性进行验证。</p> +<h2 id="run-tests">Run tests</h2> +<div class="highlighter-rouge"><pre class="highlight"><code>Before submitting code, make sure that you have properly tested the functionality and verified the implementation according to the auto test section in README. +</code></pre> +</div> -<h2 id="pr指南">PR指南</h2> -<p> 在 <a href="https://github.com/search?q=org%3Aapache+servicecomb";>Github</a> 上面可以很方便地提交 <a href="https://help.github.com/articles/about-pull-requests/";>Pull Request (PR)</a>，下面将以本网站项目<a href="https://github.com/apache/incubator-servicecomb-website";>apache/incubator-servicecomb-website</a> 为例（如果是其他项目，请替换项目名incubator-servicecomb-website）。</p> +<h2 id="how-to-submit-a-pr">How to submit a PR</h2> +<p> It’s quite convenient to submit a <a href="https://help.github.com/articles/about-pull-requests/";>Pull Request(PR)</a> on <a href="https://github.com/search?q=org%3Aapache+servicecomb";>Github</a>. Take the <a href="https://github.com/apache/incubator-servicecomb-website";>apache/incubator-servicecomb-website</a> as an example:</p> -<h3 id="fork仓库">Fork仓库</h3> +<h3 id="fork-repository">Fork repository</h3> -<p> 进入 apache/incubator-servicecomb-website 的 <a href="https://github.com/apache/incubator-servicecomb-website";>github 页面</a> ，点击右上角按钮 <code class="highlighter-rouge">Fork</code> 进行 Fork。</p> +<p> Visit the apache/incubator-servicecomb-website project’s <a href="https://github.com/apache/incubator-servicecomb-website";>github page</a>, click <code class="highlighter-rouge">Fork</code> button on the right left cornor.</p> -<p><img src="/assets/images/fork-repo.jpg" alt="体质指数应用运行界面" class="align-center" /></p> +<p><img src="/assets/images/fork-repo.jpg" alt="Fork Repository" class="align-center" /></p> -<h3 id="配置git和提交修改">配置git和提交修改</h3> +<h3 id="setup-local-repository">Setup local repository</h3> <ul> <li> - <p>将代码克隆到本地：</p> + <p>Clone the source code to local machine:</p> <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git clone https://github.com/<your_github_name>/incubator-servicecomb-website.git </code></pre> </div> - <p>注意：请将 <your_github_name> 替换为您的github名字。</p> - </li> -</ul> - -<p> clone完成后，origin会默认指向github上的远程fork地址。</p> + <p>Note: substitute <your_github_name> with your github username.</p> -<ul> + <p>After the clone is done, the origin remote will point to the default branch of the cloned repository.</p> + </li> <li> - <p>将 apache/incubator-servicecomb-website 添加为本地仓库的远程分支 upstream：</p> + <p>Add apache/incubator-servicecomb-website as upstream remote:</p> <div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="nb">cd </span>incubator-servicecomb-website git remote add upstream https://github.com/apache/incubator-servicecomb-website.git @@ -384,7 +383,7 @@ git remote add upstream https://github.com/apache/incubator-servicecomb-website. </div> </li> <li> - <p>检查远程仓库设置：</p> + <p>Check the local repository’s remotes</p> <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git remote -v origin https://github.com/<your_github_name>/incubator-servicecomb-website.git <span class="o">(</span>fetch<span class="o">)</span> @@ -395,21 +394,17 @@ upstream https://github.com/apache/incubator-servicecomb-website.git <span clas </div> </li> <li> - <p>新建分支以便在分支上做修改：</p> + <p>Create a new branch to start working</p> <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git checkout -b <your_branch_name> </code></pre> </div> - </li> -</ul> - -<p> 注意： <your_branch_name> 为您自定义的分支名字。</p> -<p> 创建完成后可进行代码更改。</p> - -<ul> + <p>Note: replace <your_branch_name> with an actual branch name at your choice, like feature-foo/bugfix-bar +Now you can start coding.</p> + </li> <li> - <p>提交代码到远程分支：</p> + <p>Push the changes to a remote repository</p> <div class="language-shell highlighter-rouge"><pre class="highlight"><code>git commit -a -m <span class="s2">"<you_commit_message>"</span> git push origin <your_branch_name> @@ -418,51 +413,53 @@ git push origin <your_branch_name> </li> </ul> -<p> 更多 git 使用方法请访问：<a href="https://www.atlassian.com/git/tutorials/setting-up-a-repository";>git 使用</a>，这里不赘述。</p> - -<h3 id="创建pr">创建PR</h3> +<p> For more on git usages, please visit<a href="https://www.atlassian.com/git/tutorials/setting-up-a-repository";>Git tutorial</a>.</p> -<p> 在浏览器切换到自己的 github 页面，切换分支到提交的分支 <your_branch_name> ，依次点击 <code class="highlighter-rouge">New pull request</code> 和 <code class="highlighter-rouge">Create pull request</code> 按钮进行创建，如下图所示：</p> +<h3 id="create-pr">Create PR</h3> +<p>Goto your github page, find the apache/incubator-servicecomb-website project, swich to the branch you just pushed, click on <code class="highlighter-rouge">New pull request</code> and then <code class="highlighter-rouge">Create pull request</code>, see the image below:</p> -<p class="figure-caption"><img src="/assets/images/new-pr.jpg" alt="体质指数应用运行界面" class="align-center" /> +<p class="figure-caption"><img src="/assets/images/new-pr.jpg" alt="New Pull Request" class="align-center" /> fig-1 New pull request</p> -<p class="figure-caption"><img src="/assets/images/create-pr.jpg" alt="体质指数应用运行界面" class="align-center" /> +<p class="figure-caption"><img src="/assets/images/create-pr.jpg" alt="Create Pull Request" class="align-center" /> fig-2 Create pull request</p> -<p> 至此，您的PR创建完成，更多关于 PR 请阅读 <a href="https://help.github.com/categories/collaborating-with-issues-and-pull-requests/";>collaborating-with-issues-and-pull-requests</a> 。</p> +<p>Congrautulations, now you have succesfully submitted a PR. For more on PR, please read <a href="https://help.github.com/categories/collaborating-with-issues-and-pull-requests/";>collaborating-with-issues-and-pull-requests</a> 。</p> + +<h3 id="resolve-conflicts">Resolve conflicts</h3> +<p>When a same piece of file is edited by multiple person simultaneously, conflicts can occur. It can be resolved as follow:</p> -<h3 id="冲突解决">冲突解决</h3> -<p> 提交PR时的代码冲突一般是由于多人编辑同一个文件引起的，解决冲突主要通过以下步骤即可：</p> <ol> - <li>切换至主分支 + <li>Switch to the master branch <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git checkout master </code></pre> </div> </li> - <li>同步远端主分支至本地 + <li>Pull the upstream’s master branch <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git pull upstream master </code></pre> </div> </li> - <li>切换回刚才的分支（假设分支名为fix） + <li>Switch back to the branch we are working on(e.g. fix) <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git checkout fix </code></pre> </div> </li> - <li>进行rebase + <li>Rebase the working branch onto the master branch <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git rebase -i master </code></pre> </div> - <p>此时会弹出修改记录的文件，一般直接保存即可。然后会提示哪些文件出现了冲突，此时可打开冲突文件对冲突部分进行修改，将提示的所有冲突文件的冲突都解决后，执行</p> + <p>A list of commits will be listed on your text editor. Normally we can just save and exit. +Git will now apply the commits one by one onto the master branch until it encounters a conflict. When this happens, the rebase process is paused. We need to resolve the conflicts, then execute</p> <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git add . git rebase --continue </code></pre> </div> - <p>依此往复，直至屏幕出现类似 <em>rebase successful</em> 字样即可，此时您可以进行往提交PR的分支进行更新：</p> + <p>Repeat this process until all commits are successfully applied. And finally run</p> <div class="language-bash highlighter-rouge"><pre class="highlight"><code>git push -f origin fix </code></pre> </div> + <p>to push the resolved branch to remote origin</p> </li> </ol> diff --git a/content/feed.xml b/content/feed.xml index 62082ef..dac21bc 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"; ><generator uri="https://jekyllrb.com/"; version="3.4.3">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2017-12-27T16:27:33+08:00</updated><id>/</id><title type="html">Apache ServiceComb (incubating)</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{"name"=>nil, "avatar"=> [...] +<?xml version="1.0" encoding="utf-8"?><feed xmlns="http://www.w3.org/2005/Atom"; ><generator uri="https://jekyllrb.com/"; version="3.4.3">Jekyll</generator><link href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" /><updated>2017-12-29T18:39:42+08:00</updated><id>/</id><title type="html">Apache ServiceComb (incubating)</title><subtitle>The homepage of ServiceComb</subtitle><author><name>{"name"=>nil, "avatar"=> [...] <p>The architecture of the <code class="highlighter-rouge">service registry</code> module in Java Chassis is as follows.</p> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
