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