You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rocketmq.apache.org by shroman <gi...@git.apache.org> on 2017/01/05 06:48:28 UTC

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

GitHub user shroman opened a pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3

    Split 'Git setup' for contributors and committers.

    Split it because in the current version the difference is not very clear.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/shroman/incubator-rocketmq-site master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-rocketmq-site/pull/3.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #3
    
----
commit 219dfe6288444b87a3b3074d583da54f381251de
Author: shtykh_roman <rs...@yahoo.com>
Date:   2017-01-05T06:46:17Z

    Split 'Git setup' for contributors and committers.

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by shroman <gi...@git.apache.org>.
Github user shroman commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94731141
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean, make use of `--squash` when merging into `apache/master`.
     
     {% include toc %}
     
     # Git setup for Contributors
    -This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github's apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up "origin" to point to your remote fork on github as the default remote. So if you perform "git push origin master" it will go to github.
    +First of all, fork github\u2019s `apache/incubator-rocketmq` to your own account on github and clone it as follows,
     
    -To attach to the apache git repo do the following:
    +    git clone https://github.com/<your_github_name>/incubator-rocketmq.git
    +
    +Cloning this locally will set up `origin` to point to your remote fork on github as the default remote.
    +Now you can create your pull requests.
    +
    +You will need to update a local master sometimes (to merge to your development branches sometimes).
    --- End diff --
    
    It's a good idea, I was thinking about it too, but decided to skip it because I suppose everyone knows it. But yes, let's add it.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by shroman <gi...@git.apache.org>.
Github user shroman commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94730828
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean take note of the use of `--squash` when merging into apache/master.
     
     {% include toc %}
     
     # Git setup for Contributors
    -This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github's apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up "origin" to point to your remote fork on github as the default remote. So if you perform "git push origin master" it will go to github.
    +First of all, fork github\u2019s `apache/incubator-rocketmq` to your own account on github and clone it as follows,
     
    -To attach to the apache git repo do the following:
    +    git clone https://github.com/<your_github_name>/incubator-rocketmq.git
    +
    +Cloning this locally will set up `origin` to point to your remote fork on github as the default remote.
    +Now you can create your pull requests.
    +
    +You will need to update a local master sometimes (to merge to your development branches sometimes).
    +For this, you have to add remote for Apache Ignite mirror as follow,
    --- End diff --
    
    yes, fixed.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site issue #3: Split 'Git setup' for contributors and com...

Posted by lizhanhui <gi...@git.apache.org>.
Github user lizhanhui commented on the issue:

    https://github.com/apache/incubator-rocketmq-site/pull/3
  
    Overall, I love this PR. Separating contributors and committers is really good to have.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:

    https://github.com/apache/incubator-rocketmq-site/pull/3


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by shroman <gi...@git.apache.org>.
Github user shroman commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94729784
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean take note of the use of `--squash` when merging into apache/master.
    --- End diff --
    
    yes, right, I haven't noticed it in the original version. I will modify it.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by shroman <gi...@git.apache.org>.
Github user shroman commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94733211
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean, make use of `--squash` when merging into `apache/master`.
     
     {% include toc %}
     
     # Git setup for Contributors
    -This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github's apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up "origin" to point to your remote fork on github as the default remote. So if you perform "git push origin master" it will go to github.
    +First of all, fork github\u2019s `apache/incubator-rocketmq` to your own account on github and clone it as follows,
     
    -To attach to the apache git repo do the following:
    +    git clone https://github.com/<your_github_name>/incubator-rocketmq.git
    +
    +Cloning this locally will set up `origin` to point to your remote fork on github as the default remote.
    +Now you can create your pull requests.
    +
    +You will need to update a local master sometimes (to merge to your development branches sometimes).
    --- End diff --
    
    Agree. Added.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by lizhanhui <gi...@git.apache.org>.
Github user lizhanhui commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94743138
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,45 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    --- End diff --
    
    Good.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by lizhanhui <gi...@git.apache.org>.
Github user lizhanhui commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94730295
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean take note of the use of `--squash` when merging into apache/master.
     
     {% include toc %}
     
     # Git setup for Contributors
    -This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github's apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up "origin" to point to your remote fork on github as the default remote. So if you perform "git push origin master" it will go to github.
    +First of all, fork github\u2019s `apache/incubator-rocketmq` to your own account on github and clone it as follows,
     
    -To attach to the apache git repo do the following:
    +    git clone https://github.com/<your_github_name>/incubator-rocketmq.git
    +
    +Cloning this locally will set up `origin` to point to your remote fork on github as the default remote.
    +Now you can create your pull requests.
    +
    +You will need to update a local master sometimes (to merge to your development branches sometimes).
    +For this, you have to add remote for Apache Ignite mirror as follow,
    --- End diff --
    
    "Apache Ignite" should be a typo here.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by vongosling <gi...@git.apache.org>.
Github user vongosling commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94732806
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean, make use of `--squash` when merging into `apache/master`.
     
     {% include toc %}
     
     # Git setup for Contributors
    -This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github's apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up "origin" to point to your remote fork on github as the default remote. So if you perform "git push origin master" it will go to github.
    +First of all, fork github\u2019s `apache/incubator-rocketmq` to your own account on github and clone it as follows,
     
    -To attach to the apache git repo do the following:
    +    git clone https://github.com/<your_github_name>/incubator-rocketmq.git
    +
    +Cloning this locally will set up `origin` to point to your remote fork on github as the default remote.
    +Now you can create your pull requests.
    +
    +You will need to update a local master sometimes (to merge to your development branches sometimes).
    --- End diff --
    
    +1, fetch and rebase may make a more clear commit history :-)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site issue #3: Split 'Git setup' for contributors and com...

Posted by zhouxinyu <gi...@git.apache.org>.
Github user zhouxinyu commented on the issue:

    https://github.com/apache/incubator-rocketmq-site/pull/3
  
    Thanks, @shroman 


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by lizhanhui <gi...@git.apache.org>.
Github user lizhanhui commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94730662
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean, make use of `--squash` when merging into `apache/master`.
     
     {% include toc %}
     
     # Git setup for Contributors
    -This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github's apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up "origin" to point to your remote fork on github as the default remote. So if you perform "git push origin master" it will go to github.
    +First of all, fork github\u2019s `apache/incubator-rocketmq` to your own account on github and clone it as follows,
     
    -To attach to the apache git repo do the following:
    +    git clone https://github.com/<your_github_name>/incubator-rocketmq.git
    +
    +Cloning this locally will set up `origin` to point to your remote fork on github as the default remote.
    +Now you can create your pull requests.
    +
    +You will need to update a local master sometimes (to merge to your development branches sometimes).
    --- End diff --
    
    Maybe we should suggest contributors to use `git fetch` and `git rebase` command to follow up changes made in upstream.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by shroman <gi...@git.apache.org>.
Github user shroman commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94738341
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,45 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    --- End diff --
    
    I simplified it and added your suggested wordings.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by lizhanhui <gi...@git.apache.org>.
Github user lizhanhui commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94729360
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean take note of the use of `--squash` when merging into apache/master.
    --- End diff --
    
    "To keep the commit history clean take note of the use of `--squash` when merging into apache/master." This sentence sounds weird. How about "To keep the commit history clean,  please make use of `--squash` when merging into apache/master."?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by shroman <gi...@git.apache.org>.
Github user shroman commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94732917
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,45 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    --- End diff --
    
    Btw, this paragraph should be revised. I don't understand well what it tries to convey so I left it as-is. Shall we remove it?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by vongosling <gi...@git.apache.org>.
Github user vongosling commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94728311
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,40 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    +To keep the commit history clean take note of the use of `--squash` when merging into apache/master.
     
     {% include toc %}
     
     # Git setup for Contributors
    -This describes setup for one local repo and two remotes. It allows you to push the code on your machine to either your Github repo or to git-wip-us.apache.org. You will want to fork github's apache/incubator-rocketmq to your own account on github, this will enable Pull Requests of your own. Cloning this fork locally will set up "origin" to point to your remote fork on github as the default remote. So if you perform "git push origin master" it will go to github.
    +First of all, fork github\u2019s `apache/incubator-rocketmq` to your own account on github and clone it as follows,
     
    -To attach to the apache git repo do the following:
    +    git clone https://github.com/<your_github_name>/incubator-rocketmq.git
    +
    +Cloning this locally will set up `origin` to point to your remote fork on github as the default remote.
    +Now you can create your pull requests.
    +
    +You will need to update a local master sometimes (to merge to your development branches sometimes).
    +For this, you have to add remote for Apache Ignite mirror as follow,
    +
    +    git remote add upstream https://github.com/apache/incubator-rocketmq.git
    +
    +# Git setup for Committers
    --- End diff --
    
    Nice, Separated Contributors and Commiterters


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by lizhanhui <gi...@git.apache.org>.
Github user lizhanhui commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94734427
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -4,23 +4,45 @@ permalink: /docs/pull-request/
     modified: 2016-12-24T15:01:43-04:00
     ---
     
    -There are several ways to setup Git for committers and contributors. Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers. To keep the commit history clean take note of the use of --squash below when merging into apache/master.
    +There are several ways to setup Git for committers and contributors.<br />
    +Contributors can safely setup Git any way they choose but committers should take extra care since they can push new commits to the master at Apache and various policies there make backing out mistakes problematic. Therefore all but very small changes should go through a PR, even for committers.<br />
    --- End diff --
    
    IMO, we should drop this paragraph. To complement, we'd better move the last warning to the committer repository set-up section, stating something like "To guarantee code quality of the master branch, all but minor changes should go through pull requests reviewed by peer committers."


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site issue #3: Split 'Git setup' for contributors and com...

Posted by vongosling <gi...@git.apache.org>.
Github user vongosling commented on the issue:

    https://github.com/apache/incubator-rocketmq-site/pull/3
  
    Alright. please @zhouxinyu @lizhanhui review again:-)


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] incubator-rocketmq-site pull request #3: Split 'Git setup' for contributors ...

Posted by vongosling <gi...@git.apache.org>.
Github user vongosling commented on a diff in the pull request:

    https://github.com/apache/incubator-rocketmq-site/pull/3#discussion_r94727928
  
    --- Diff: _docs/06-best-practice-pull-request.md ---
    @@ -53,7 +70,9 @@ Push your branch to Github:
     # How to create a PR (contributors)
     Create pull requests: [GitHub PR docs](https://help.github.com/articles/creating-a-pull-request/).
     
    -Pull requests are made to apache/incubator-rocketmq repository on Github. In the Github UI you should pick the master branch to target the PR as described for committers. This will be reviewed and commented on so the merge is not automatic. This can be used for discussing a contributions in progress.
    +_Make sure you follow_ [Coding Guidelines]{http://rocketmq.apache.org/docs/code-guidelines/} _before you create a pull request._
    --- End diff --
    
    cool


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---