2 Commits

Include renames

Author	SHA1	Message	Date
Jinjing	333023fb67	feat: show merge conflicts in source control sidebar (#204) ... * Squashed commits - refactor - commit design doc * docs: add why-comments to conflict resolution code and track conflicts on open - Add explanatory comments throughout conflict resolution code covering safety constraints, architectural boundaries, and compatibility choices - Track unresolved conflicts in openConflictFile so Resolved locally state works for conflict-safe entry point - Add CLAUDE.md/AGENTS.md guideline for documenting the "why" - Add test for conflict tracking through openConflictFile	2026-03-29 15:40:23 -07:00
Jinjing	3644aa8f29	Show committed files in the "source control" tab (#181) ... * refactor: auto-review fixes and UI improvements - Remove dead code and fix type assertion in getBranchDiff - Tighten GitDiffBinaryResult type constraint - Fix race condition in CombinedDiffViewer with generationRef - Fix reference stability in setGitBranchCompareResult - Extract LazySection component to fix max-lines lint - Update filesystem IPC to match updated signatures - Adjust file explorer item spacing and font size * fix: correct test expectation for staged diff header label	2026-03-28 17:00:40 -07:00