Backlog: P1a logged e3d138761973
- Author
- Andy McCall @andymccall <[email protected]>
- When
- · 2026-09-29 04:48 UTC
- Signature
- ✔ signed by Andy McCall
- Hash
e3d1387619738ec8c089a32f205ed3559848a0fcc4fe95f80c4f752660e9fe95- Depends on
- 75036530b621 b0abd4a74708
- Depended on by
- 49e9da11c6e3
- 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
modified docs/backlog-overnight-2.md +9 −0
| … | 619 unchanged lines |
||
| 620 | 620 | oxygenhub's jobs are as in F6b2 (build 139 s, test 109 s, clippy 48 s). |
|
| 621 | 621 | - **The F group is done.** |
|
| 622 | 622 | - **Andy:** the workstation had 19 GB free after the image build; Docker's build cache grew. I removed only my own tarball, not the months-old images there. |
|
| 623 | + | - 2026-09-29 **P1a done** (oxygenhub#30; Andy's item 1, first part). P1 was split into P1a, P1c and P1b. |
|
| 624 | + | - `/{owner}/{name}/resolve/{bookmark}/{path}` parses a conflicted text file's markers into plain text and regions, with each side's change. |
|
| 625 | + | - Per region, keep one side, every side, none, or your own text (a deletion side keeps the deletion); regions are linkable (`#region-N`). |
|
| 626 | + | - It commits through the delegate as a web edit, a `resolution` change depending on every contributor. |
|
| 627 | + | - It refuses if the bookmark moved since the page loaded; malformed markers go to the plain editor, which stays offered. |
|
| 628 | + | - The change page tags resolutions. The web edit's follow-ups are shared (`after_web_commit`). |
|
| 629 | + | - Parser and assembly unit tests; the edits test resolves a real conflict through the page. |
|
| 630 | + | - Deployed; hub run green. |
|
| 631 | + | - **Next:** P1c (tree conflicts, VS Code hand-off), then P1b (live collaboration). |