Merge window: Difference between revisions

From Official Kodi Wiki
Jump to navigation Jump to search
>Jmarshall
No edit summary
(From Martijn's post)
Line 9: Line 9:


If you do a pull request and get little feedback, then make sure you specifically request the feedback from those that are most appropriate to review.
If you do a pull request and get little feedback, then make sure you specifically request the feedback from those that are most appropriate to review.
===Steps===
# Do a PR for features or things that need some reviewing or you are unsure of
# Assign the appropriate label(s) that are available
# Assign a reviewer that will sign of your PR (maybe there should be multiple) and ping him about this
#*'''''Note:''' GitHub only allows one person to be assigned a PR, so if multiple sign offs are required, just put in one and ping/poke the others.''
# Once signed of the PR can be assigned to the next merge window milestone.
# If review takes to long don't hesitate to bug who must do the sign off.
# If merge window is open feel free to merge because it has been assigned to the milestone and is deemed ready to go
==See also==
==See also==
*[[XBMC development]]
*[[XBMC development]]

Revision as of 10:15, 21 September 2012

This page describes the "merge window" procedure used by Team XBMC to merge pull requests into the master git branch.

Procedure

In order to minimise the periods where features are added to XBMC, and to encourage review of features prior to addition, the XBMC team operates a merge window policy. New features may only be merged from a pull request (PR) during the merge window. The rest of the time is left for bug fixing.

If you have a simple bug fix, you can slot it straight into master whenever you like. If it is a non-trivial bugfix, then it's probably best to do a pull request, asking for the specific folk who should review prior to going in.

If you have a new feature addition, then it needs to go through a pull request. Currently the merge windows are the 1st to the 10th of the month. Thus, if you have a new feature, you first do a pull request, and then solicit review. Assuming review brings up no issues, you can assign it to the merge window (using github issues) and pull it in during the 1st to the 10th of the month. If you miss the window, too bad - wait for the next month.

If you do a pull request and get little feedback, then make sure you specifically request the feedback from those that are most appropriate to review.

Steps

  1. Do a PR for features or things that need some reviewing or you are unsure of
  2. Assign the appropriate label(s) that are available
  3. Assign a reviewer that will sign of your PR (maybe there should be multiple) and ping him about this
    • Note: GitHub only allows one person to be assigned a PR, so if multiple sign offs are required, just put in one and ping/poke the others.
  4. Once signed of the PR can be assigned to the next merge window milestone.
  5. If review takes to long don't hesitate to bug who must do the sign off.
  6. If merge window is open feel free to merge because it has been assigned to the milestone and is deemed ready to go

See also