Skip to content

Policies

Friedrich edited this page Feb 21, 2014 · 11 revisions

Merging Pull Requests to master

  1. Branches behind Pull Request (PR) should be rebased to latest master before merging the PR. Reason is that this avoids a hard to read history with lots of parallel branches.

  2. Pull Request should be merged by pressing the "Merge" button in the github UI. Reasons are because that way the branch is "grouped" by the resulting merge commit and, more important, the merging commit message has some pointer to the related PR and the discussion that might have happened on the PR.

  3. Pull Request should be merged by the person which raised the PR. Reasons are because that enables that person to squash any fixup commits created during review, also rebase to latest master, if needed, and allows to do another possible update to the PR, if wanted. Most important: getting paid for his patch by satisfaction from pressing the "big green button", right.

  4. Pull Requests can be merged if one trusted (define yourself) person commented on the PR with an explicit "Ship it" or "Merge it".

Commiting Directly to master

Commits that are considered to not need review can be committed directly to master, without doing some PR dance. Again they should be done against the latest master, so the history is a single thread.

Closing Issues

Usually the person who opened an issue should close it. (github automatically closing issues screws that slightly)

Clone this wiki locally