diff --git a/modules/engineering.md b/modules/engineering.md
index be15964..e5779b4 100644
--- a/modules/engineering.md
+++ b/modules/engineering.md
@@ -11,6 +11,9 @@
   manual discipline
 - Conventional Commits: `feat:`, `chore:`, `fix:`, `docs:`
 - Rebase feature branches onto main (linear history)
+- Enable `git rerere` (`git config --global rerere.enabled true`, plus
+  `rerere.autoupdate true` to auto-stage what it resolves) so conflict
+  resolutions are recorded and auto-replayed across repeated or long rebases
 - Fail fast: validate at boundaries, return/throw early
 - Minimize brace nesting: invert conditions, early returns
 - Use named constants, not string literals for domain values