Skip to content

Commit 76bf167

Browse files
Link release guidance from branch docs
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent 20b4cf1 commit 76bf167

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

docs/content/get-started/module-bootstrap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,6 @@ A module bootstrapped this way:
6060
## When to use this
6161

6262
- The module has no usable release yet, and the load-bearing core hasn't landed.
63-
- Use this only for the initial bootstrap. Once `main` has a first release, ongoing feature work targets `main` directly with ordinary topic branches, or a [stacked pull request](https://msx.no/docs/Ways-of-Working/Branching-and-Merging/#stacked-pull-requests) when changes genuinely depend on each other.
63+
- Use this only for the initial bootstrap. Once `main` has a first release, ongoing feature work targets `main` directly with ordinary topic branches, uses the [release branch pattern](../guides/versioning-and-releases.md#release-branch-pattern) to batch independent features, or uses a [stacked pull request](https://msx.no/docs/Ways-of-Working/Branching-and-Merging/#stacked-pull-requests) when changes genuinely depend on each other.
6464

6565
For the general branching and merge model, see [MSX Branching and Merging](https://msx.no/docs/Ways-of-Working/Branching-and-Merging/).

docs/content/reference/powershell-module-standard.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ The release process treats each merged PR as a release on a single linear ancest
115115

116116
### Release and feature branches
117117

118-
For large work, open a release branch and target it from feature branches. Apply the `Prerelease` label on the release branch PR to publish preview versions before the final merge to `main`.
118+
For large work, follow the [release branch pattern](../guides/versioning-and-releases.md#release-branch-pattern):
119+
open a release branch and target it from feature branches. Apply the `Prerelease` label on
120+
the release branch PR to publish preview versions before the final merge to `main`.
119121

120122
## CI/CD pipeline
121123

docs/content/specification/principles-and-practices.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ patch.
1414

1515
## Release and feature branches
1616

17-
If you need to work forth a bigger release, create a branch representing the release (a release branch) and open a PR towards `main` for this branch.
17+
If you need to work toward a bigger release, follow the [release branch pattern](../guides/versioning-and-releases.md#release-branch-pattern):
18+
create a branch representing the release and open a PR toward `main` for this branch.
1819
For each topic or feature to add to the release, open a new branch representing the feature (a feature branch) and open a PR towards the release
1920
branch. Optionally add the `Prerelease` label on the PR for the release branch, to release preview versions before merging and releasing a published
2021
version of the PowerShell module.

0 commit comments

Comments
 (0)