Backlog: P1c done; P1d and P1e added 0cded3d844e4
- Author
- Andy McCall @andymccall <[email protected]>
- When
- · 2026-09-29 04:59 UTC
- Signature
- ✔ signed by Andy McCall
- Hash
0cded3d844e4c58111b6bf2ef87a58d2bb9bffe26496e744c8cd5c0b109a29c0- Depends on
- 28fee1c9eb6c 75036530b621 bb94d06c8049
- Depended on by
- 1d27d0a2b3c1 7f64236d2829
- In bookmarks
- agents-in-readme bare-hashes carried-not-removed carry-identical doctor-trust identical-sides keyless-tags main merge-remote-bookmark only-help-103 paths-for-resolutions-and-amend push-notes show-stat subrepo-pin-state switch-says
- In tags
- v0.1.0 v0.10.0 v0.11.0 v0.2.0 v0.3.0 v0.3.1 v0.4.0 v0.4.1 v0.4.2 v0.4.3 v0.4.4 v0.4.5 v0.4.6 v0.5.0 v0.5.1 v0.6.0 v0.7.0 v0.8.0 v0.9.0
- Edits
- 2 atoms, 0 tree operations, 1 file
Browse the tree at this change
modified docs/backlog-overnight-2.md +3 −1
| … | 79 unchanged lines |
||
| 80 | 80 | - [x] M9b `submodule status` shows added-but-unpinned and has `--json` (5, 7); doctor before the first commit (8). |
|
| 81 | 81 | - [x] M10 Hub: say "signed by an unlinked key" on changes and in `/api/v1/user`, pointing at Settings (feedback 14). |
|
| 82 | 82 | - [x] P1a Text conflicts resolved region by region on OxygenHub (first part of P1, below). |
|
| 83 | - | - [ ] P1c Tree conflicts on the resolver (keep a candidate), and "resolve in VS Code" handing a conflict to oxygen-vscode. |
|
| 83 | + | - [x] P1c Name conflicts on the resolver: keep one candidate, which takes the name as a move. |
|
| 84 | + | - [ ] P1d "Resolve in VS Code": the resolver hands a conflict to oxygen-vscode (a vscode:// URI the extension handles: clone or open, switch to the bookmark, open the file). |
|
| 85 | + | - [ ] P1e Replace conflicts of binary files: oxy-core cannot yet resolve one by keeping an existing candidate (writing a candidate's bytes counts as no change); make that a resolution, then offer it on the resolver. |
|
| 84 | 86 | - [ ] P1 **Conflict resolution on OxygenHub** (Andy's list, item 1). A resolver page for a conflicted state: |
|
| 85 | 87 | - Per conflict region: pick a side, several sides, or none; edit freely; tree conflicts too (keep a candidate). |
|
| 86 | 88 | - Commit the result as a `kind = resolution` change on the bookmark, through the web-edit path. Signing: sealed when the author next pushes, or "resolve in VS Code" hands off to oxygen-vscode. |
|
| … | 469 unchanged lines |