Skip to content

Docs: Refactors master branch references to main#5811

Merged
NaluTripician merged 1 commit intomasterfrom
users/ntripician/rename-default-branch-docs
Apr 29, 2026
Merged

Docs: Refactors master branch references to main#5811
NaluTripician merged 1 commit intomasterfrom
users/ntripician/rename-default-branch-docs

Conversation

@NaluTripician
Copy link
Copy Markdown
Contributor

Renames git-branch references from master to main in documentation, agent playbooks, helper scripts, and YAML template prose, ahead of the planned GitHub default-branch rename.

See Software Freedom Conservancy: Renaming the default git branch for context.

This is PR A of 3:

  • PR A (this PR) — docs, agents, scripts, README, .gitignore, template prose
  • PR B — adds main to trigger: filters in azure-pipelines*.yml (alongside master, transitional) — to be merged immediately before the GitHub branch rename
  • PR C — drops master from trigger: filters once main is verified in CI

⚠️ Do NOT merge until Monday's coordinated cutover.

What changed

Area Files
Top-level docs README.md, CONTRIBUTING.md, changelog.md (link-only), .gitignore
Repo docs docs/builds-and-pipelines.md, docs/sync_up_msdata_direct.md, docs/caches.md, docs/Cross Region Request Hedging.md, docs/observability.md, docs/LocalQuorum.md
Copilot / agents .github/copilot-instructions.md, .github/agents/release-copilot-agent.agent.md, .github/agents/msdata-direct-sync-agent.agent.md, .github/agents/issue-fix-agent.agent.md
Helper scripts tools/msdata-direct-sync-helper.ps1
Template prose templates/build-preview.yml, templates/static-tools-encryption.yml, templates/static-tools-encryption-custom.yml (display names + comments only — no behavior change)

Intentionally NOT changed

  • Pipeline trigger: filters in azure-pipelines*.yml — handled in PR B / PR C.
  • Cosmos product terminologymulti-master, single-master, master key, MasterKey, multimaster, master-key. These are unrelated to the git branch.
  • Historical changelog entries referencing past PR titles or describing past behavior.
  • docs/PerPartitionAutomaticFailoverDesign.md and docs/LocalQuorum.md write-account terminology.

Stats

18 files changed, 153 insertions(+), 153 deletions(-).

Renames git-branch references from master to main in documentation,
agent playbooks, helper scripts, and YAML template prose ahead of the
GitHub default-branch rename. See https://sfconservancy.org/news/2020/jun/23/gitbranchname/.

Scope:
- README.md, CONTRIBUTING.md, changelog.md (link only), .gitignore
- docs/*.md (excluding Cosmos master/multi-master terminology)
- .github/copilot-instructions.md and .github/agents/*.md
- tools/msdata-direct-sync-helper.ps1
- templates/build-preview.yml, templates/static-tools-encryption*.yml prose

Out of scope (intentionally untouched):
- Pipeline trigger filters in azure-pipelines*.yml (handled in a follow-up PR)
- Cosmos product terminology (multi-master, single-master, master key, MasterKey)
- Historical changelog PR titles

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines:
Successfully started running 1 pipeline(s).

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines:
Successfully started running 1 pipeline(s).

Copy link
Copy Markdown
Member

@kushagraThapar kushagraThapar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @NaluTripician

@NaluTripician NaluTripician merged commit 0830090 into master Apr 29, 2026
33 checks passed
@NaluTripician NaluTripician deleted the users/ntripician/rename-default-branch-docs branch April 29, 2026 23:18
NaluTripician added a commit that referenced this pull request Apr 30, 2026
Adds `main` alongside `master` to the `trigger:`/`schedules:` branch
filters in every actively-triggered Azure Pipelines YAML, ahead of the
planned GitHub default-branch rename.

See [Software Freedom Conservancy: Renaming the default git
branch](https://sfconservancy.org/news/2020/jun/23/gitbranchname/).

This is **PR B of 3**:
- PR A (#5811) — docs / agents / scripts
- **PR B (this PR)** — adds `main` to CI trigger filters, transitional,
dual-branch
- PR C — drops `master` from CI trigger filters once `main` is verified

⚠️ **Do NOT merge until Monday's coordinated cutover.** This PR must be
merged immediately *before* the GitHub branch rename so CI continues
firing on both `master` (until rename) and `main` (immediately after
rename). Pipeline branch filters do **not** follow GitHub's
branch-rename redirects, which is why this transitional dual-include is
required.

### Files changed
| File | Change |
| --- | --- |
| `azure-pipelines.yml` | `pr.branches.include` adds `- main` |
| `azure-pipelines-functional.yml` | `pr.branches.include` adds `- main`
|
| `azure-pipelines-cron.yml` | `schedules[*].branches.include` adds `-
main` |
| `azure-pipelines-nightly.yml` | `schedules[*].branches.include` adds
`- main` |
| `azure-pipelines-rolling.yml` | Both `schedules[*].branches.include`
blocks add `- main` |

5 files, +6 lines.

### Out of scope
Pipelines using `trigger: none` (`azure-pipelines-official.yml`,
`-encryption-official.yml`, `-encryption-custom-official.yml`,
`-faultinjection.yml`, `-msdata-direct.yml`, `-msdata-aot.yml`,
`-ctl-publishing.yml`) configure their branches in the Azure DevOps UI
and will be updated as part of the cutover, not by a YAML change.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants