From f3db981fa7c21bf2009f004528b1ae280c84c0d5 Mon Sep 17 00:00:00 2001
From: Lex Christopherson <lex@glittercowboy.com>
Date: Sat, 31 Jan 2026 15:17:35 -0600
Subject: [PATCH] docs: update changelog and README for v1.11.0

---
 CHANGELOG.md | 16 +++++++++++++++-
 README.md    | 17 +++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71afbf5de..717b58842 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,19 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [1.11.0] - 2026-01-31
+
+### Added
+- Git branching strategy configuration with three options:
+  - `none` (default): commit to current branch
+  - `phase`: create branch per phase (`gsd/phase-{N}-{slug}`)
+  - `milestone`: create branch per milestone (`gsd/{version}-{slug}`)
+- Squash merge option at milestone completion (recommended) with merge-with-history alternative
+- Context compliance verification dimension in plan checker — flags if plans contradict user decisions
+
+### Fixed
+- CONTEXT.md from `/gsd:discuss-phase` now properly flows to all downstream agents (researcher, planner, checker, revision loop)
+
 ## [1.10.1] - 2025-01-30
 
 ### Fixed
@@ -1069,7 +1082,8 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - YOLO mode for autonomous execution
 - Interactive mode with checkpoints
 
-[Unreleased]: https://github.com/glittercowboy/get-shit-done/compare/v1.10.1...HEAD
+[Unreleased]: https://github.com/glittercowboy/get-shit-done/compare/v1.11.0...HEAD
+[1.11.0]: https://github.com/glittercowboy/get-shit-done/releases/tag/v1.11.0
 [1.10.1]: https://github.com/glittercowboy/get-shit-done/releases/tag/v1.10.1
 [1.10.0]: https://github.com/glittercowboy/get-shit-done/releases/tag/v1.10.0
 [1.9.12]: https://github.com/glittercowboy/get-shit-done/releases/tag/v1.9.12
diff --git a/README.md b/README.md
index cd4a5ff14..fb40dec03 100644
--- a/README.md
+++ b/README.md
@@ -526,6 +526,23 @@ Use `/gsd:settings` to toggle these, or override per-invocation:
 | `parallelization.enabled` | `true` | Run independent plans simultaneously |
 | `planning.commit_docs` | `true` | Track `.planning/` in git |
 
+### Git Branching
+
+Control how GSD handles branches during execution.
+
+| Setting | Options | Default | What it does |
+|---------|---------|---------|--------------|
+| `git.branching_strategy` | `none`, `phase`, `milestone` | `none` | Branch creation strategy |
+| `git.phase_branch_template` | string | `gsd/phase-{phase}-{slug}` | Template for phase branches |
+| `git.milestone_branch_template` | string | `gsd/{milestone}-{slug}` | Template for milestone branches |
+
+**Strategies:**
+- **`none`** — Commits to current branch (default GSD behavior)
+- **`phase`** — Creates a branch per phase, merges at phase completion
+- **`milestone`** — Creates one branch for entire milestone, merges at completion
+
+At milestone completion, GSD offers squash merge (recommended) or merge with history.
+
 ---
 
 ## Troubleshooting