Distillation

Date: Sep 16, 2026

• 🔴 (09:59) User stated that jj never fails on conflict; after rebase, new, or squash, conflicts are recorded in the resulting commit and must be checked with jj st, resolved by manually editing files, and confirmed cleared with another jj st.
• 🔴 [enforced-workflow] (09:59) User directed that repositories containing .jj/ must use jj rather than git for mutations, including colocated repositories containing both .jj/ and .git/.
• 🔴 [enforced-workflow] (09:59) User prohibited interactive jj commands and flags, including -i, --interactive, jj resolve, and jj diffedit; commit/description operations must pass -m "msg" to avoid opening an editor.
• 🔴 [enforced-workflow] (09:59) User required verifying jj mutations with jj st and jj log after squash, abandon, rebase, restore, or commit; prefers stable letter-based change IDs over hexadecimal commit IDs.