Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: update pull request instructions to include Pivotal ticket workflow

...

After pushing your changes into your GitHub fork, you have published your changes but have not really told the Fedora community about them. To do this, generate a pull-request on GitHub. If your commits are on a branch other than 'master', be sure to update the commit range (changing 'master' to the correct branch name). Then record this on the Pivotal ticket, and use the URL to the pull-request and include a good comment that describes your changes.  Finish the Pivotal ticket;  the ticket will then be ready to deliver, and the integration managers will be alerted that you have a pull request outstanding.

NOTE: If you use good commit descriptions and fill out a good pull-request description, then you can just paste the same description as the Pivotal comment (without the summary line).

MeanwhileAfter the ticket is "Finished", one of Fedora's integration managers will be notified of your new pull-request. The role of an integration manager is to review the incoming pull-requests and decide whether they should be accepted and on which branch(es) they should be merged. As such, only a few people have this responsibility.

An integration manager will review your request within a few days, and often much faster. They will comment on your pull-request via the discussion or line notes, or in the Pivotal ticket. If they like what they see, they will merge your proposed changes into the correct branch(es), then "Deliver" and "Accept" your Pivotal ticket. However, they may like to see additional changes, in which case they will describe in the pull-request discussion area (or in line notes, or Pivotal ticket) what they would like you to change, and "Reject" the ticket, to indicate to the ticket owner that the ball is back in their court. If you disagree, just use the discussion area. Otherwise, go back to your local topic branch for this issue, make the requested changes, commit them locally, and push them to same branch in your fork repository (using the same commands as before). As long as you are on the same branch (not simply named the same, but actually the same branch), GitHub will automatically update the pull-request with your additional commit(s) and notify the integration managers again. Once they are acceptableFinish the Pivotal ticket again. Once the changes are accepted, the integration managers will merge your commits into the upstream repository.

...