OXYGENHUB

Backlog: P1 split; P1a done, P1c next bb94d06c8049

Author
Andy McCall @andymccall <[email protected]>
When
· 2026-09-29 04:45 UTC
Signature
✔ signed by Andy McCall
Hash
bb94d06c804965ace75557b1dadda0be07d47916119244829e9a742165753859
Depends on
28fee1c9eb6c 75036530b621 ed5b9ef990a3
Depended on by
0cded3d844e4
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
1 atom, 0 tree operations, 1 file

Browse the tree at this change

hide whitespace changes
modified docs/backlog-overnight-2.md +2 −0
… 
78 unchanged lines
79 79 
- [x] M9a `oxy describe` naming (tag, else nearest tag + distance + change, else bookmark + change, `-dirty`, `--json`), tags accepted where a change is and `tag list` showing heads (feedback 4); `commit -F` (6).
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 + 
- [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.
82 84 
- [ ] P1 **Conflict resolution on OxygenHub** (Andy's list, item 1). A resolver page for a conflicted state:
83 85 
  - Per conflict region: pick a side, several sides, or none; edit freely; tree conflicts too (keep a candidate).
84 86 
  - 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