From 5d249f7241c784f685cc1c2ad932d4f614d9e460 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 13 Jul 2026 11:33:03 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=93=96=20[Docs]:=20Default=20branches?= =?UTF-8?q?=20to=20the=20default=20branch=20and=20target=20PRs=20at=20thei?= =?UTF-8?q?r=20base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/docs/Ways-of-Working/Branching-and-Merging.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/docs/Ways-of-Working/Branching-and-Merging.md b/src/docs/Ways-of-Working/Branching-and-Merging.md index 2b885ca..5e27b6f 100644 --- a/src/docs/Ways-of-Working/Branching-and-Merging.md +++ b/src/docs/Ways-of-Working/Branching-and-Merging.md @@ -10,12 +10,14 @@ How changes move from a working branch into a protected branch. The model is sma ## Topic branches - Work happens on short-lived branches cut from the default branch — one per issue. Each gets its own [worktree](Git-Worktrees.md). +- The base is the default branch unless another is named. A topic branch is cut from the default branch by default; an agent follows the same default and branches from somewhere else only when explicitly instructed to. - Name branches `/-`, e.g. `feat/42-pagination` or `fix/99-null-context`. The type matches the change type. - Branches stay short-lived. The longer a branch lives, the further it diverges and the harder it is to merge. ## Pull requests only - Protected branches are never pushed to directly. Every change arrives through a pull request — even a one-line fix. +- A pull request is raised against its base branch — the branch the topic branch 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 from the base branch only when that is explicitly intended. - A pull request is green before review begins. Automated checks run first, so reviewers spend their attention on judgment rather than on catching what CI catches. This is [shift left](Principles/Engineering-Practices.md#shift-left). - Keep pull requests small and focused: one deliverable, reviewable in a single pass. From ac5d1da587fcda08546b1689edf32932147e0427 Mon Sep 17 00:00:00 2001 From: Marius Storhaug Date: Mon, 13 Jul 2026 11:40:10 +0200 Subject: [PATCH 2/2] Address review: tighten base default, avoid overloading 'base branch' --- src/docs/Ways-of-Working/Branching-and-Merging.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/docs/Ways-of-Working/Branching-and-Merging.md b/src/docs/Ways-of-Working/Branching-and-Merging.md index 5e27b6f..1357383 100644 --- a/src/docs/Ways-of-Working/Branching-and-Merging.md +++ b/src/docs/Ways-of-Working/Branching-and-Merging.md @@ -9,15 +9,14 @@ How changes move from a working branch into a protected branch. The model is sma ## Topic branches -- Work happens on short-lived branches cut from the default branch — one per issue. Each gets its own [worktree](Git-Worktrees.md). -- The base is the default branch unless another is named. A topic branch is cut from the default branch by default; an agent follows the same default and branches from somewhere else only when explicitly instructed to. +- Work happens on short-lived branches — one per issue, each in its own [worktree](Git-Worktrees.md). A branch is cut from the default branch unless a different base is explicitly given; an agent follows the same default. - Name branches `/-`, e.g. `feat/42-pagination` or `fix/99-null-context`. The type matches the change type. - Branches stay short-lived. The longer a branch lives, the further it diverges and the harder it is to merge. ## Pull requests only - Protected branches are never pushed to directly. Every change arrives through a pull request — even a one-line fix. -- A pull request is raised against its base branch — the branch the topic branch 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 from the base branch only when that is explicitly intended. +- A pull request targets the branch its topic branch was cut from. A branch off the default branch merges back into it; in the promotion model a branch off `dev` targets `dev`, not `main`. Redirect the target only when that is explicitly intended. - A pull request is green before review begins. Automated checks run first, so reviewers spend their attention on judgment rather than on catching what CI catches. This is [shift left](Principles/Engineering-Practices.md#shift-left). - Keep pull requests small and focused: one deliverable, reviewable in a single pass.