From 1c14609dc48002b92a7e37bd9ff4269e727d75b4 Mon Sep 17 00:00:00 2001 From: jan-kubica Date: Mon, 22 Jun 2026 13:34:11 +0200 Subject: [PATCH 1/2] docs(meta): recommend git rerere for repeated/long rebases --- modules/engineering.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/engineering.md b/modules/engineering.md index be15964..c1a9685 100644 --- a/modules/engineering.md +++ b/modules/engineering.md @@ -11,6 +11,8 @@ manual discipline - Conventional Commits: `feat:`, `chore:`, `fix:`, `docs:` - Rebase feature branches onto main (linear history) +- Enable `git rerere` (`git config --global rerere.enabled true`) 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 From 93f18b6eb6fb4c7e71c0629b18f3f531df5b4eba Mon Sep 17 00:00:00 2001 From: jan-kubica Date: Mon, 22 Jun 2026 13:51:21 +0200 Subject: [PATCH 2/2] docs(meta): also recommend rerere.autoupdate --- modules/engineering.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/engineering.md b/modules/engineering.md index c1a9685..e5779b4 100644 --- a/modules/engineering.md +++ b/modules/engineering.md @@ -11,7 +11,8 @@ manual discipline - Conventional Commits: `feat:`, `chore:`, `fix:`, `docs:` - Rebase feature branches onto main (linear history) -- Enable `git rerere` (`git config --global rerere.enabled true`) so conflict +- 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