Backlog: P1c logged 49e9da11c6e3
- Author
- Andy McCall @andymccall <[email protected]>
- When
- · 2026-09-29 05:02 UTC
- Signature
- ✔ signed by Andy McCall
- Hash
49e9da11c6e37a986d3c024d4bf7d00a702e3242ff2302d8c13db1e4da98dfa9- Depends on
- 75036530b621 e3d138761973
- Depended on by
- 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
- 1 atom, 0 tree operations, 1 file
Browse the tree at this change
modified docs/backlog-overnight-2.md +8 −0
| … | 628 unchanged lines |
||
| 629 | 629 | - Parser and assembly unit tests; the edits test resolves a real conflict through the page. |
|
| 630 | 630 | - Deployed; hub run green. |
|
| 631 | 631 | - **Next:** P1c (tree conflicts, VS Code hand-off), then P1b (live collaboration). |
|
| 632 | + | - 2026-09-29 **P1c done** (oxygenhub#31). |
|
| 633 | + | - **Name conflicts** (several files want one name, shown as `NAME.oxy-conflict-N`) resolve on the resolver by keeping one candidate. |
|
| 634 | + | - Its content goes to the name and every candidate is removed, which the snapshot records as a move of the kept file: identity kept, and the test checks the change's file kind is `renamed`. |
|
| 635 | + | - It commits as a resolution, refused if the bookmark moved. |
|
| 636 | + | - The conflicts page links name conflicts and gives their full path (it gave the bare name). |
|
| 637 | + | - Directory and link name conflicts stay with clients. |
|
| 638 | + | - Deployed; hub run green. |
|
| 639 | + | - **Added:** P1d (resolve in VS Code) and P1e (binary replace conflicts need a core change first: writing a candidate's bytes counts as no change today). |