| 1 |
commit: 5614ffab3d353ff5506040b3005a5458b36c48be |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 29 11:39:25 2014 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 29 11:39:25 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5614ffab |
| 7 |
|
| 8 |
Be more precise on the branching |
| 9 |
|
| 10 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
CONTRIBUTING.md | 8 ++++---- |
| 14 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md |
| 17 |
index 8f02ccc..99561d0 100644 |
| 18 |
--- a/CONTRIBUTING.md |
| 19 |
+++ b/CONTRIBUTING.md |
| 20 |
@@ -64,9 +64,9 @@ In order to send pull request and ask for inclusion of your changes you need to |
| 21 |
hub fork |
| 22 |
|
| 23 |
###Branch out for contribution |
| 24 |
-It is always convenient for development as well as for the review and merging process, if the development is done in branches. |
| 25 |
+It is always convenient for development as well as for the review and merging process, if the development is done in branches. Let's branch the overlay into a local branch named PACKAGE_NAME. |
| 26 |
|
| 27 |
- git checkout -b my-feature master |
| 28 |
+ git checkout -b PACKAGE_NAME master |
| 29 |
|
| 30 |
For the fastest process during merging it is best to have a single branch per package. |
| 31 |
|
| 32 |
@@ -83,9 +83,9 @@ Once *all* reported problems are resolved, you can commit it |
| 33 |
repo-commit "Here we write a comprehensible commit message" |
| 34 |
|
| 35 |
###Push to Github and make a pull request |
| 36 |
-Next we push back the changes to our fork and send a pull-request to the overlay maintainers. |
| 37 |
+Next we push back the changes in the PACKAGE_NAME branch to our fork and send a pull-request to the overlay maintainers. |
| 38 |
|
| 39 |
- hub push YOUR_GITHUB_USER |
| 40 |
+ hub push YOUR_GITHUB_USER PACKAGE_NAME |
| 41 |
hub pull-request |
| 42 |
|
| 43 |
Lastly you need to wait for review comments and the merge of your work. If you feel that they are slacking, don't bother to ping them again. In case you need to include some improvements, just commit your work again using *repo-commit* and push it again to your fork. No need to send another pull-request as your new changes will be added to the original one. |
Archives