You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by cs...@apache.org on 2015/11/17 00:12:10 UTC

[1/2] incubator-apex-site git commit: Added support for multiple individuals contributing to a pull request

Repository: incubator-apex-site
Updated Branches:
  refs/heads/master 7b9bba33f -> 550447c42


Added support for multiple individuals contributing to a pull request


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/4086e315
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/4086e315
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/4086e315

Branch: refs/heads/master
Commit: 4086e315e6f4c4f034bac6ec7b077d3c8c2ddb8a
Parents: 90b0863
Author: Pramod Immaneni <pr...@datatorrent.com>
Authored: Fri Nov 13 12:41:09 2015 -0800
Committer: Pramod Immaneni <pr...@datatorrent.com>
Committed: Fri Nov 13 18:15:39 2015 -0800

----------------------------------------------------------------------
 src/md/contributing.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/4086e315/src/md/contributing.md
----------------------------------------------------------------------
diff --git a/src/md/contributing.md b/src/md/contributing.md
index 788072b..10a4a72 100644
--- a/src/md/contributing.md
+++ b/src/md/contributing.md
@@ -24,7 +24,7 @@ Creating a local branch that tracks a remote makes pull easier (no need to speci
   - Run `mvn license:format -Dlicense.skip=false` to automatically add the header when missing.
 1. Once your feature is complete, submit the pull request on github against `devel-3`.
 1. If you want specific people to review your pull request, use the `@` notation in Github comments to mention that user, and request that he/she reviews your changes.
-1. After all review is complete, combine all new commits into one squashed commit, and include the Jira number in the commit message. There are several ways to squash commits, but [here is one explanation from git-scm.com](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits) and a simple example is illustrated below:
+1. After all review is complete, combine all new commits into one squashed commit except when there are multiple contributors, and include the Jira number in the commit message. There are several ways to squash commits, but [here is one explanation from git-scm.com](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Squashing-Commits) and a simple example is illustrated below:
 
   If tracking upstream/devel-3 then run `git rebase -i`. Else run `git rebase -i upstream/devel-3`.  
   This command opens the text editor which lists the multiple commits:
@@ -51,6 +51,7 @@ Creating a local branch that tracks a remote makes pull easier (no need to speci
   pick 67cd79b change1
   squash 6f98905 change2
   ```
+1. If there are multiple contributors in a pull request preserve individual attributions. Try to squash the commits to the minimum number of commits required to preserve attribution and the contribution to still be functionally correct.
 1. Till the review is complete it may happen that working feature branch may diverge from `devel-3` substantially. Therefore, it is recommended to frequently merge `devel-3` to the branch being worked on by:
   * when the branch tracks upstream/devel-3  
   `git pull`

[2/2] incubator-apex-site git commit: Merge branch 'pramod_master'

Posted by cs...@apache.org.
Merge branch 'pramod_master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/commit/550447c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/550447c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/550447c4

Branch: refs/heads/master
Commit: 550447c4270b8f22b72342ab036ff095d2d6f559
Parents: 7b9bba3 4086e31
Author: Chandni Singh <cs...@apache.org>
Authored: Sun Nov 15 22:02:06 2015 -0800
Committer: Chandni Singh <cs...@apache.org>
Committed: Sun Nov 15 22:02:06 2015 -0800

----------------------------------------------------------------------
 src/md/contributing.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------