File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -2,8 +2,6 @@ NOTE: this repository uses a "Merge Forward" strategy
22
33Changes should be made in the earliest applicable branch, and
44merged forward through subsequent branches.
5- 1 . Create a PR into the oldest branch (` ubuntu-<short_name> ` )
6- 2 . After this PR has been merged create a ` merge-to-<next_short_name> ` branch
7- 3 . Merge ` ubuntu-<short_name> ` into ` merge-to-<next_short_name> `
8- 4 . Create a PR to merge ` merge-to-<next_short_name> ` into ` ubuntu-<next_short_name> `
9- 5 . Repeat as needed for subsequent branches
5+ 1 . PR should be created against the oldest stemcell branch, ex: ` ubuntu-<short_name-N> `
6+ 2 . After this PR has been merged create a PR to merge ` ubuntu-<short_name-N> ` into ` ubuntu-<short_name-N+1> `
7+ 3 . Repeat as needed for subsequent stemcell line branches
You can’t perform that action at this time.
0 commit comments