Master Branch - PurdueMarketingAndMedia/purdueTemplates-2015 GitHub Wiki

Master Branch

Overview

  • name : master
  • branches from : NA
  • merges into: NA

Description

The master branch will always contain the production-ready version of the repository.

Merging Into (Updating)

Any merging will be initiated via a pull request. Each pull request will summarize updates being applied to the template, and provide line-by-line comparisons of changed files. A pull request will only attempt to merge either a release branch or a maintenance branch.

Merge a Release Branch

If the pull request originates from a release branch, then an extended period of time will be allotted for review. This amount of time depends on the size of the update.

Merge a Maintenance Branch

If the pull request originates from a maintenance branch, it will most likely be merged within 24 hours, if not instantly. This amount of time depends on the urgency of the fixes being applied.