From b2eae8798540ee3b68efd7744f9048a379ee8a3b Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Sun, 22 Feb 2026 16:41:43 -0600 Subject: [PATCH] episode: Rebase feature branch onto next-release before PR to avoid merge conflicts --- episodes/2026-02-22.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/episodes/2026-02-22.md b/episodes/2026-02-22.md index 6681ddd8bb2..a8cdb66fc7e 100644 --- a/episodes/2026-02-22.md +++ b/episodes/2026-02-22.md @@ -60,3 +60,7 @@ Work types: configuration, ## 16:41 - Fix: UTC/CST timezone ambiguity in transaction freeze/thaw scheduling — utils/timezone.py - **Type:** fix - **Tags:** major-domo, timezone, transaction-freeze, production-fix, discord-bot, python, fix + +## 16:41 - Rebase feature branch onto next-release before PR to avoid merge conflicts +- **Type:** procedure +- **Tags:** major-domo, git-workflow, next-release, rebase, discord-bot, procedure