Add GitHub Flow and Octopus Merge pattern article#358
Merged
Conversation
Introduces github-flow.md, a companion to the parallel development guide covering day-to-day GitHub Flow usage and a reference CI/CD pipeline implementing the Octopus Merge pattern for keeping a shared test environment in sync with all open pull requests. Cross-links between the two articles, fixes broken/placeholder links in parallel-development.md, and adds Mermaid diagrams for the branching model, merge flow, job dependencies, and end-to-end workflow. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Adds a new day-to-day GitHub Flow guide (including an Octopus Merge reference pipeline) and updates the existing parallel development article to cross-link and explain when/why to use GitHub Flow + Octopus Merge vs GitFlow vs plain trunk-based development.
Changes:
- Expand
parallel-development.mdwith a GitHub Flow + Octopus Merge recommendation, Mermaid branching diagram, and updated workflow guidance. - Add
github-flow.md, documenting Octopus Merge and providing Azure Pipelines + GitHub Actions reference implementations with Mermaid diagrams. - Improve cross-linking between the two articles and update surrounding narrative/wording.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| content/getting-started/parallel-development.md | Reframes branching strategy guidance and adds GitHub Flow + Octopus Merge section and updated common workflow steps. |
| content/getting-started/github-flow.md | New companion article detailing GitHub Flow daily practice and an Octopus Merge reference CI/CD pipeline with diagrams and examples. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
otykier
approved these changes
Jul 6, 2026
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
otykier
approved these changes
Jul 6, 2026
DocFX only raises UidNotFound for the explicit [text](xref:uid) link form, not the @uid shorthand — and content/todo/{powerbi-cicd,as-cicd} aren't part of the published build, so those two xrefs never resolve. The explicit form used here (unlike the shorthand already used elsewhere for the same pages) triggered the warning, and the build script treats any DocFX warning in the English build as fatal. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
|
Azure Static Web Apps: Your stage site is ready! Visit it here: https://delightful-mud-081affe03-358.westeurope.azurestaticapps.net |
|
Azure Static Web Apps: Your stage site is ready! Visit it here: https://delightful-mud-081affe03-358.westeurope.azurestaticapps.net |
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
|
Azure Static Web Apps: Your stage site is ready! Visit it here: https://delightful-mud-081affe03-358.westeurope.azurestaticapps.net |
otykier
approved these changes
Jul 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Introduces github-flow.md, a companion to the parallel development guide covering day-to-day GitHub Flow usage and a reference CI/CD pipeline implementing the Octopus Merge pattern for keeping a shared test environment in sync with all open pull requests. Cross-links between the two articles, fixes broken/placeholder links in parallel-development.md, and adds Mermaid diagrams for the branching model, merge flow, job dependencies, and end-to-end workflow.