hl-valdemar/vamp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

feat: add configurable three-pane conflict views

Browse Source
This commit is contained in:
Valdemar Lorenzen
2026-10-16 16:19:54 +02:00
parent a6310594c5
commit de6a57e67d
11 changed files with 176 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO.md
+4 -2
View File
@@ -27,8 +27,10 @@
- show unresolved comments by default; `--all` includes resolved comments.
- manually resolve/unresolve comments in Vamp, independently of staleness; persist status in SQLite and version 3 JSON.
- preserve filename arguments, configured storage, and incompatible data; no MCP, agent replies, or automatic dispatch.
- [ ] add an option for three pane lef/base/right view for conflict resolution.
- alternative pane layout as left/right with base underneath (configurable)
- [x] add an option for three pane left/base/right view for conflict resolution.
- alternative pane layout as left/right with base underneath (`config.resolve_history_layout = "base_below"`)
- [ ] pull out tests from implementation code, and place them in a dedicated test folder.
- maybe a test folder sibling to `src` could make sense? 🤔
- [ ] diff view: GitHub code review integration after the local review UX is usable.
- publish local reviews explicitly: general PR comments, inline line/range comments, review summaries, approval, and requests for changes.
- preserve explicit PR identity and reviewed commit IDs; validate anchors against GitHub's PR diff and recheck the PR head before submission.