diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a2e4fb33c9..10ae7a26fb 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,8 +2,6 @@ NOTE: this repository uses a "Merge Forward" strategy Changes should be made in the earliest applicable branch, and merged forward through subsequent branches. -1. Create a PR into the oldest branch (`ubuntu-`) -2. After this PR has been merged create a `merge-to-` branch -3. Merge `ubuntu-` into `merge-to-` -4. Create a PR to merge `merge-to-` into `ubuntu-` -5. Repeat as needed for subsequent branches +1. PR should be created against the oldest stemcell branch, ex: `ubuntu-` +2. After this PR has been merged create a PR to merge `ubuntu-` into `ubuntu-` +3. Repeat as needed for subsequent stemcell line branches