You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ad...@apache.org on 2016/02/26 22:46:30 UTC

incubator-mynewt-site git commit: specified the need to fork/branch when doing pull requests & also closed a pull request that cannot be merged #10

Repository: incubator-mynewt-site
Updated Branches:
  refs/heads/master 82d6d2c03 -> 6dc8d7470


specified the need to fork/branch when doing pull requests & also closed a pull request that cannot be merged #10

 This closes #10


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/commit/6dc8d747
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/tree/6dc8d747
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/diff/6dc8d747

Branch: refs/heads/master
Commit: 6dc8d74701a2af028a8531582a44209a09369efa
Parents: 82d6d2c
Author: aditihilbert <ad...@runtime.io>
Authored: Fri Feb 26 11:53:48 2016 -0800
Committer: aditihilbert <ad...@runtime.io>
Committed: Fri Feb 26 11:53:52 2016 -0800

----------------------------------------------------------------------
 custom-theme/community.html                | 2 +-
 docs/os/get_acclimated/how_to_edit_docs.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/6dc8d747/custom-theme/community.html
----------------------------------------------------------------------
diff --git a/custom-theme/community.html b/custom-theme/community.html
index 7bfc563..8cb846f 100644
--- a/custom-theme/community.html
+++ b/custom-theme/community.html
@@ -138,7 +138,7 @@
                 <br>
                 <ol>
                 <li>
-                Clone the repository into a local branch on your machine and make your changes. Then submit a pull request on the github mirror of the appropriate Apache Mynewt repository by clicking the green "New pull request" button on the page:
+                Fork the mirrored repository to create your very own repo on github. Clone the forked repository into a local branch on your machine and make your changes. Then submit a pull request from the fork on the github mirror of the appropriate Apache Mynewt repository by clicking the green "New pull request" button on the page:
                    <ul>
                    <br>
                    <li><a href="https://github.com/apache/incubator-mynewt-larva">Apache Mynewt larva repo mirrored on github</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-site/blob/6dc8d747/docs/os/get_acclimated/how_to_edit_docs.md
----------------------------------------------------------------------
diff --git a/docs/os/get_acclimated/how_to_edit_docs.md b/docs/os/get_acclimated/how_to_edit_docs.md
index 3a08697..50ffade 100644
--- a/docs/os/get_acclimated/how_to_edit_docs.md
+++ b/docs/os/get_acclimated/how_to_edit_docs.md
@@ -106,7 +106,7 @@ We suggest you follow the proposed non-committer workflow at Apache to share you
         $ git format-patch origin/trunk
 ```  
 
-* Alternatively, you can use the mirror on github.com to submit a pull request. The mirror is located at [https://github.com/apache/incubator-mynewt-site](https://github.com/apache/incubator-mynewt-site). It is up to you to decide whether to create a fork or a branch to work in and submit pull requests from. Your pull request will be reviewed by a committer for docs and merged into the master branch when the changes are understood and accepted. 
+* Alternatively, you can use the mirror on github.com to submit a pull request. The mirror is located at [https://github.com/apache/incubator-mynewt-site](https://github.com/apache/incubator-mynewt-site). It is up to you to decide whether to create a fork or a branch to work in and submit pull requests from. Remember you cannot push changes to the master on the github mirror, so you have to create a fork or a branch first. Your pull request will be reviewed by a committer for docs and merged into the master branch when the changes are understood and accepted. 
 
 
 ### Conversion to HTML