2 Commits

Author	SHA1	Message	Date
Valdemar Lorenzen	ef4c38d8a7	feat: resolve conflicts through focused two-way drafts ... Replace the marker-filled three-pane resolver with a marker-free native Draft versus frozen Alternative projected from current working text. Preserve preexisting outside edits, native undo, dirty-save guards, all sides/bases, and draft caret/viewports across separate History views. Reuse DiffState alignment/highlighting/excerpts for Resolution and merge its base-aligned rows for readonly three-way History. Hide explorer and source-selector chrome by default. Verified 926 tests plus actual terminal projection, History highlighting, hunk choice, optional explorer, and guarded jj-confirmed save workflows. Clippy completes with pre-existing warnings only. Smoke fixtures stay unresolved in this ancestry; remove that ancestry before publication. Size exception: approximately 1650 implementation added/deleted lines, excluding tests/docs, kept coherent because native draft lifecycle and aligned rendering must change together without parallel legacy modes.	2026-10-14 17:01:45 +02:00
Valdemar Lorenzen	a3aef713e2	feat: resolve current jj working-copy conflicts ... Add a dedicated native resolver workspace with all side/base inputs, shared editable Results, region choices, retained per-file status, responsive rendering, and explicit nontext file choices. Guard writes with jj working-copy locking, frozen checkout identity, exact disk baselines, native dirty-buffer protection, and asynchronous jj snapshot/status confirmation. Historical comparisons remain readonly. Verified all 916 tests and live isolated terminal workflows covering text regions, narrow layouts, binary bytes and symlink targets/types. Clippy completes with pre-existing warnings only. Size exception: 2614 implementation additions/deletions excluding tests and docs. Native workspace integration, explicit file choices and the safe save/check operation are retained as one complete behavioral slice.	2026-10-14 16:04:15 +02:00