Repository: bahir-website Updated Branches: refs/heads/asf-site d928e3362 -> f8e64ab5f
Publishing from 0f734b01841421ddb9267323882bde7b98e88ac0 Project: http://git-wip-us.apache.org/repos/asf/bahir-website/repo Commit: http://git-wip-us.apache.org/repos/asf/bahir-website/commit/f8e64ab5 Tree: http://git-wip-us.apache.org/repos/asf/bahir-website/tree/f8e64ab5 Diff: http://git-wip-us.apache.org/repos/asf/bahir-website/diff/f8e64ab5 Branch: refs/heads/asf-site Commit: f8e64ab5f5f96714d460688285d9c05450f607b9 Parents: d928e33 Author: Luciano Resende <[email protected]> Authored: Tue May 31 00:21:39 2016 -0700 Committer: Luciano Resende <[email protected]> Committed: Tue May 31 00:21:39 2016 -0700 ---------------------------------------------------------------------- content/contributing/index.html | 43 +++++++++++++++--------------------- content/feed.xml | 4 ++-- 2 files changed, 20 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bahir-website/blob/f8e64ab5/content/contributing/index.html ---------------------------------------------------------------------- diff --git a/content/contributing/index.html b/content/contributing/index.html index 0e467b8..7883f8b 100644 --- a/content/contributing/index.html +++ b/content/contributing/index.html @@ -154,12 +154,9 @@ <h1 id="contributing-code-changes">Contributing code changes</h1> -<p>Please review the preceding section before proposing a code change. This section documents how to do so.</p> +<p>Please review the preceding section before proposing a code change. This section documents how to do so:</p> -<p><code> -When you contribute code, you affirm that the contribution is your original work and that you license the work to the project under the project's open source license. -Whether or not you state this explicitly, by submitting any copyrighted material via pull request, email, or other means you agree to license the material under the project's open source license and warrant that you have the legal authority to do so. -</code></p> +<p><img src="https://developer.atlassian.com/s/en_GB/5989/aaad9997c145089d7f38b9dea0ac5b91728ef55a.56/_/images/icons/emoticons/check.png"; /> <strong>When you contribute code, you affirm that the contribution is your original work and that you license the work to the project under the projectâs open source license. Whether or not you state this explicitly, by submitting any copyrighted material via pull request, email, or other means you agree to license the material under the projectâs open source license and warrant that you have the legal authority to do so.</strong></p> <ol> <li><a href="#JIRA">Identifiyng JIRAS</a></li> @@ -219,39 +216,36 @@ Whether or not you state this explicitly, by submitting any copyrighted material <p>Make sure you do not have any uncommitted changes and rebase master with latest changes from upstream:</p> -<p><code> -git fetch upstream +<pre><code>git fetch upstream git checkout master git rebase upstream/master -</code></p> +</code></pre> <p>Now you should rebase your branch with master, to receive the upstream changes</p> -<p><code> -git checkout branch +<pre><code>git checkout branch git rebase master -</code></p> +</code></pre> <p>In both cases, you can have conflicts:</p> -<p>``` -error: could not apply fa39187⦠something to add to patch A</p> +<pre><code>error: could not apply fa39187... something to add to patch A -<p>When you have resolved this problem, run âgit rebase âcontinueâ. -If you prefer to skip this patch, run âgit rebase âskipâ instead. -To check out the original branch and stop rebasing, run âgit rebase âabortâ. -Could not apply fa39187f3c3dfd2ab5faa38ac01cf3de7ce2e841⦠Change fake file -```</p> +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". +Could not apply fa39187f3c3dfd2ab5faa38ac01cf3de7ce2e841... Change fake file +</code></pre> <p>Here, Git is telling you which commit is causing the conflict (fa39187). Youâre given three choices:</p> <ul> - <li>You can run <code>git rebase --abort</code> to completely undo the rebase. Git will return you to your branchâs state as it was before git rebase was called.</li> - <li>You can run <code>git rebase --skip</code> to completely skip the commit. That means that none of the changes introduced by the problematic commit will be included. It is very rare that you would choose this option.</li> + <li>You can run <strong>git rebase âabort</strong> to completely undo the rebase. Git will return you to your branchâs state as it was before git rebase was called.</li> + <li>You can run <strong>git rebase âskip</strong> to completely skip the commit. That means that none of the changes introduced by the problematic commit will be included. It is very rare that you would choose this option.</li> <li>You can fix the conflict.</li> </ul> -<p>To fix the conflict, you can follow <a href="https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line";>the standard procedures for resolving merge conflicts from the command line</a>. When youâre finished, youâll need to call <code>git rebase --continue</code> in order for Git to continue processing the rest of the rebase.</p> +<p>To fix the conflict, you can follow <a href="https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line";>the standard procedures for resolving merge conflicts from the command line</a>. When youâre finished, youâll need to call <strong>git rebase âcontinue</strong> in order for Git to continue processing the rest of the rebase.</p> <h2 id="creating-a-pull-request">Creating a Pull Request</h2> @@ -279,12 +273,11 @@ Could not apply fa39187f3c3dfd2ab5faa38ac01cf3de7ce2e841⦠Change fake file <p>Below is an example of a good commit message</p> -<p>``` -[BAHIR-130] Performance enhancements for decision tree</p> +<pre><code>[BAHIR-130] Performance enhancements for decision tree -<p>Generate Matrix with random values through local memory +Generate Matrix with random values through local memory if there is sufficient memory. -```</p> +</code></pre> <h2 id="code-review-criteria">Code Review Criteria</h2> <p>Before considering how to contribute code, itâs useful to understand how code is reviewed, and why changes may be rejected. Simply put, changes that have many or large positives, and few negative effects or risks, are much more likely to be merged, and merged quickly. Risky and less valuable changes are very unlikely to be merged, and may be rejected outright rather than receive iterations of review.</p> http://git-wip-us.apache.org/repos/asf/bahir-website/blob/f8e64ab5/content/feed.xml ---------------------------------------------------------------------- diff --git a/content/feed.xml b/content/feed.xml index 14e7c78..d9ddde8 100644 --- a/content/feed.xml +++ b/content/feed.xml @@ -5,8 +5,8 @@ <description></description> <link>/</link> <atom:link href="/feed.xml" rel="self" type="application/rss+xml"/> - <pubDate>Mon, 30 May 2016 23:36:27 -0700</pubDate> - <lastBuildDate>Mon, 30 May 2016 23:36:27 -0700</lastBuildDate> + <pubDate>Tue, 31 May 2016 00:21:38 -0700</pubDate> + <lastBuildDate>Tue, 31 May 2016 00:21:38 -0700</lastBuildDate> <generator>Jekyll v3.0.0</generator> <item>
![https://developer.atlassian.com/s/en_GB/5989/aaad9997c145089d7f38b9dea0ac5b91728ef55a.56/_/images/icons/emoticons/check.png"](https://developer.atlassian.com/s/en_GB/5989/aaad9997c145089d7f38b9dea0ac5b91728ef55a.56/_/images/icons/emoticons/check.png"){kind=link}