Skip to content

📖 [Docs]: Default branches to the default branch and target PRs at their base#40

Merged
Marius Storhaug (MariusStorhaug) merged 2 commits into
mainfrom
docs/branch-base-default
Jul 13, 2026
Merged

📖 [Docs]: Default branches to the default branch and target PRs at their base#40
Marius Storhaug (MariusStorhaug) merged 2 commits into
mainfrom
docs/branch-base-default

Conversation

@MariusStorhaug

Copy link
Copy Markdown
Member

Documents two defaults in the Branching and Merging standard: the base a topic branch is cut from, and the branch a pull request targets. Both were implicit before; this makes them explicit for humans and agents alike.

Changed: Branching and Merging

  • A topic branch is cut from the default branch by default, unless another base is explicitly named — and an agent follows the same default, branching from elsewhere only when instructed to.
  • A pull request is raised against its base branch — the branch it was cut from. A branch off the default branch merges back into the default branch; in the promotion model a branch off dev targets dev, not main. The target differs only when explicitly intended.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the Branching and Merging standard to make two previously implicit defaults explicit: (1) topic branches are cut from the repository’s default branch unless a different base is explicitly specified, and (2) pull requests should target the branch they were branched from (with the target differing only when intentionally chosen).

Changes:

  • Adds an explicit default for the base branch used when creating topic branches (including agent behavior).
  • Clarifies that pull requests should target their branch of origin, with an example for promotion-model repos (devdev).

Comment thread src/docs/Ways-of-Working/Branching-and-Merging.md Outdated
Comment thread src/docs/Ways-of-Working/Branching-and-Merging.md Outdated

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

@MariusStorhaug
Marius Storhaug (MariusStorhaug) merged commit 5fdb4c3 into main Jul 13, 2026
20 checks passed
@MariusStorhaug
Marius Storhaug (MariusStorhaug) deleted the docs/branch-base-default branch July 13, 2026 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants