3 commits

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	5c461c8021	Add AGENTS.md and CLAUDE.md configuration files (#70) ... Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-23 16:49:12 -07:00
Jinjing	cd14506142	chore: add CLAUDE.md and gitignore package-lock.json (#63) ... * feat: use Enter to submit and Shift+Enter for line break in comment editor Closes #48 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * chore: add CLAUDE.md and gitignore package-lock.json Enforce pnpm usage for AI agents and prevent stray npm lock files. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-23 16:22:24 -07:00