Regenerate website
Project: http://git-wip-us.apache.org/repos/asf/beam-site/repo Commit: http://git-wip-us.apache.org/repos/asf/beam-site/commit/582a7f45 Tree: http://git-wip-us.apache.org/repos/asf/beam-site/tree/582a7f45 Diff: http://git-wip-us.apache.org/repos/asf/beam-site/diff/582a7f45 Branch: refs/heads/asf-site Commit: 582a7f452eed30d815cfddc6af331812e63ccf61 Parents: 2f35897 Author: Davor Bonaci <da...@google.com> Authored: Mon Feb 27 16:18:18 2017 -0800 Committer: Davor Bonaci <da...@google.com> Committed: Mon Feb 27 16:18:18 2017 -0800 ---------------------------------------------------------------------- content/contribute/contribution-guide/index.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam-site/blob/582a7f45/content/contribute/contribution-guide/index.html ---------------------------------------------------------------------- diff --git a/content/contribute/contribution-guide/index.html b/content/contribute/contribution-guide/index.html index 580b7e6..5f8ec98 100644 --- a/content/contribute/contribution-guide/index.html +++ b/content/contribute/contribution-guide/index.html @@ -419,9 +419,9 @@ $ git checkout -b <my-branch> origin/master <p>Remember to always use <code class="highlighter-rouge">--rebase</code> parameter to avoid extraneous merge commits.</p> -<p>To push your local, committed changes to your (forked) repository on GitHub, run:</p> +<p>Then you can push your local, committed changes to your (forked) repository on GitHub. Since rebase may change that branchâs history, you may need to force push. Youâll run:</p> -<div class="highlighter-rouge"><pre class="highlight"><code>$ git push <GitHub_user> <my-branch> +<div class="highlighter-rouge"><pre class="highlight"><code>$ git push <GitHub_user> <my-branch> --force </code></pre> </div> @@ -438,12 +438,14 @@ $ git checkout -b <my-branch> origin/master <p>Once the initial code is complete and the tests pass, itâs time to start the code review process. We review and discuss all code, no matter who authors it. Itâs a great way to build community, since you can learn from other developers, and they become familiar with your contribution. It also builds a strong project by encouraging a high quality bar and keeping code consistent throughout the project.</p> <h3 id="create-a-pull-request">Create a pull request</h3> -<p>Organize your commits to make your reviewerâs job easier. Use the following command to re-order, squash, edit, or change description of individual commits.</p> +<p>Organize your commits to make your reviewerâs job easier. Reviewers normally prefer multiple small pull requests, instead of a single large pull request. Within a pull request, a relatively small number of commits that break the problem into logical steps is preferred. For most pull requests, youâll squash your changes down to 1 commit. You can use the following command to re-order, squash, edit, or change description of individual commits.</p> <div class="highlighter-rouge"><pre class="highlight"><code>$ git rebase -i origin/master </code></pre> </div> +<p>Youâll then push to your branch on GitHub. Note: when updating your commit after pull request feedback and use squash to get back to one commit, you will need to do a force submit to the branch on your repo.</p> + <p>Navigate to the <a href="https://github.com/apache/beam";>Beam GitHub mirror</a> to create a pull request. The title of the pull request should be strictly in the following format:</p> <div class="highlighter-rouge"><pre class="highlight"><code>[BEAM-<JIRA-issue-#>] <Title of the pull request>
