Skip to content

Commit 3af2a53

Browse files
authored
📖 docs: clarify merge method for dev to main promotions (#136)
Add a maintainer note that dev->main PRs must use a merge commit, not squash, since the release automation walks individual commit messages since the last tag to detect a version bump. Squash merging (as happened with #131) collapses commits into one non-bump-worthy commit and silently skips tag/changelog/release/container publish steps. $Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent 587c2f7 commit 3af2a53

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

CONTRIBUTING.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ While this project doesn't currently have a comprehensive test suite, when contr
179179
- [ ] Test bot functionality manually
180180
- [ ] Ensure Docker build succeeds
181181

182+
> [!IMPORTANT]
183+
> **Maintainers:** When promoting `dev``main`, use **"Create a merge commit"**, not "Squash and merge". The release automation (`build-flow.yml`) walks individual commit messages since the last tag to detect a version bump. Squashing collapses them into a single non-bump-worthy commit, silently skipping the tag/changelog/release/container publish steps (as happened with #131).
184+
182185
## 🏗️ Architecture & Technical Details
183186

184187
### 🔄 How the System Works

0 commit comments

Comments
 (0)