Recover and resolve the preserved root integration conflicts #21

New issue

Open

opened 2026-09-14 07:06:35 +00:00 by kayg · 1 comment

kayg commented

2026-09-14 07:06:35 +00:00

Owner

Affected tracked files include App/Sources/Notes/NoteEditorHost.swift, App/Sources/Notes/NoteEditorSession.swift and App/Tests/NoteEditorSessionTests.swift (unresolved index stages), plus modified coordination instructions. The large untracked corpus is explicitly outside the snapshot until classified.

Preserve current tracked working files and base/ours/theirs conflict stages on a clearly named WIP branch without modifying the live index/worktree.
Push and verify the exact preservation ref on Forgejo and GitHub.
Compare with current dev and decide which changes are superseded or still required.
Resolve only in an isolated integration checkout; retain source and review evidence.
Run checks appropriate to any retained product change, then merge or explicitly abandon.

Master: #20. Cleanup: #19. Related note title/preview work: #5 and #11. Snapshot owner: root/preserve_unfinished_snapshots. Status: preservation in progress, no implementation acceptance claimed.

The primary checkout remains in an unresolved integration state even though the verified integration branch has been pushed to dev. Preserve this state separately, then determine which edits are still needed; do not overwrite the working checkout or treat a preservation snapshot as shippable. Affected tracked files include App/Sources/Notes/NoteEditorHost.swift, App/Sources/Notes/NoteEditorSession.swift and App/Tests/NoteEditorSessionTests.swift (unresolved index stages), plus modified coordination instructions. The large untracked corpus is explicitly outside the snapshot until classified. - [ ] Preserve current tracked working files and base/ours/theirs conflict stages on a clearly named WIP branch without modifying the live index/worktree. - [ ] Push and verify the exact preservation ref on Forgejo and GitHub. - [ ] Compare with current dev and decide which changes are superseded or still required. - [ ] Resolve only in an isolated integration checkout; retain source and review evidence. - [ ] Run checks appropriate to any retained product change, then merge or explicitly abandon. Master: #20. Cleanup: #19. Related note title/preview work: #5 and #11. Snapshot owner: root/preserve_unfinished_snapshots. Status: preservation in progress, no implementation acceptance claimed.

kayg commented

2026-09-14 07:13:39 +00:00

Author

Owner

Remote preservation checkpoint — 2026-09-14

The following original-worktree candidates are now pushed and exact hashes verified on both Forgejo and GitHub. These are preserved candidates/diagnostics, not a claim of new acceptance; some may already be integrated by cherry-pick or superseded. Use the issue’s existing evidence before choosing changes to resume.

codex/wip/root-conflict-snapshot-20260914 — 8ff8d38cd91a587bb778e199ca253c6822ce40a7

Master #20 contains the resume instructions. No force push; dev remains 1d8f4adf.

Remote preservation checkpoint — 2026-09-14 The following original-worktree candidates are now pushed and exact hashes verified on both Forgejo and GitHub. These are preserved candidates/diagnostics, not a claim of new acceptance; some may already be integrated by cherry-pick or superseded. Use the issue’s existing evidence before choosing changes to resume. - `codex/wip/root-conflict-snapshot-20260914` — `8ff8d38cd91a587bb778e199ca253c6822ce40a7` Master #20 contains the resume instructions. No force push; dev remains 1d8f4adf.

kayg referenced this issue

2026-09-14 07:14:22 +00:00

Track unfinished work, preserved branches and acceptance gates #20

kayg referenced this issue

2026-09-14 07:14:50 +00:00

Complete stale worktree cleanup without losing unmerged work #19

No labels

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

kayg/calternal-macos#21

No description provided.

Rows
Columns