You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by sa...@apache.org on 2015/12/30 22:14:22 UTC
incubator-apex-site git commit: Updating contributing info from APEX
to APEXCORE
Repository: incubator-apex-site
Updated Branches:
refs/heads/master 7aae0b8aa -> 54aafc74b
Updating contributing info from APEX to APEXCORE
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/54aafc74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/tree/54aafc74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-site/diff/54aafc74
Branch: refs/heads/master
Commit: 54aafc74b98b1d39be92cb070716d9f4933ddbd4
Parents: 7aae0b8
Author: sashadt <sa...@datatorrent.com>
Authored: Wed Dec 30 13:14:16 2015 -0800
Committer: sashadt <sa...@datatorrent.com>
Committed: Wed Dec 30 13:14:16 2015 -0800
----------------------------------------------------------------------
src/md/contributing.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-site/blob/54aafc74/src/md/contributing.md
----------------------------------------------------------------------
diff --git a/src/md/contributing.md b/src/md/contributing.md
index a2c3657..cc090b3 100644
--- a/src/md/contributing.md
+++ b/src/md/contributing.md
@@ -46,7 +46,7 @@ The apex-core and apex-malhar repositories both have mirror repositories on gith
1. Add [incubator apex core](https://github.com/apache/incubator-apex-core) as a remote repository (one time step):
`git remote add upstream https://github.com/apache/incubator-apex-core`
1. Create a new branch from the [devel-3](https://github.com/apache/incubator-apex-core/tree/devel-3) branch. **Name your branch with the JIRA number in it, e.g. `APEXCORE-123.my-feature`.**
-`git checkout -b APEX-123.my-feature -t upstream/devel-3`
+`git checkout -b APEXCORE-123.my-feature -t upstream/devel-3`
Creating a local branch that tracks a remote makes pull easier (no need to specify the remote branch while pulling). A branch can be made to track a remote branch anytime, not necessarily at its creation by:
`git branch -u upstream/devel-3`
1. When adding new files, please include the Apache v2.0 license header.
@@ -89,16 +89,16 @@ Creating a local branch that tracks a remote makes pull easier (no need to speci
`git pull upstream devel-3`
1. If a pull from `devel-3` results in a conflict then resolve it and commit the merge. This results in additional merge commits in the pull request. Following steps help to ensure that the final pull request contains just one commit:
* Rename the original branch:
- `git branch -m APEX-123.my-feature.squash`
+ `git branch -m APEXCORE-123.my-feature.squash`
* Create a new branch (with the original name) from upstream/devel-3 that has latest changes:
- `git checkout -b APEX-123.my-feature -t upstream/devel-3`
+ `git checkout -b APEXCORE-123.my-feature -t upstream/devel-3`
* Squash merge the old branch which was renamed. When the new branch has the latest changes then this squash will result only in the changes that were made for the feature:
- `git merge --squash APEX-123.my-feature.squash`
+ `git merge --squash APEXCORE-123.my-feature.squash`
* Commit the squash and force push it to the old feature remote branch so that the pull request is automatically updated:
- `git commit -m "APEX-123 #comment added my-feature" `
- `git push origin +APEX-123.my-feature`
+ `git commit -m "APEXCORE-123 #comment added my-feature" `
+ `git push origin +APEXCORE-123.my-feature`
* Delete the extra squash branch:
- `git branch -D APEX-123.my-feature.squash`
+ `git branch -D APEXCORE-123.my-feature.squash`
Thanks for contributing!