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

..

right-sidebar-conflict-resolution-status.md

feat: show merge conflicts in source control sidebar (#204)

2026-03-29 15:40:23 -07:00

source-control-branch-diff-design.md

Show committed files in the "source control" tab (#181)

2026-03-28 17:00:40 -07:00