Backlog: rebase into the working copy overnight bd445775b94e
refs #42
- Author
- Andy McCall @andymccall <[email protected]>
- When
- · 2026-09-30 15:04 UTC
- Signature
- ✔ signed by Andy McCall
- Hash
bd445775b94e79c197aace767807c4c63d7b11e1dcce111cd1bb20656dbff36b- Depends on
- 33e77a5526fa
- Depended on by
- nothing yet
- 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-3.md +8 −0
| … | 135 unchanged lines |
||
| 136 | 136 | - [ ] H5 **Linux's full history** (about 1.3 million commits) if H3 shows |
|
| 137 | 137 | it can finish overnight. Otherwise, write up what stands in the way. |
|
| 138 | 138 | ||
| 139 | + | ## From the feedback (2026-09-30) |
|
| 140 | + | ||
| 141 | + | - [ ] R1 **Rebase into the working copy** (oxygen#42, Andy chose the |
|
| 142 | + | overnight loop): when `oxy rebase CHANGE --onto TARGET` would be |
|
| 143 | + | conflicted, offer to leave the conflict in the working copy to resolve |
|
| 144 | + | and commit, as `merge` does, instead of refusing. Tests for a stacked |
|
| 145 | + | proposal brought up to date this way. |
|
| 146 | + | ||
| 139 | 147 | ## Finally |
|
| 140 | 148 | ||
| 141 | 149 | - [ ] Z1 Re-run the full `~/bench/linux-bench.sh` with the final build, |
|
| … | 9 unchanged lines |