T-WTHE-start-task-lift-frontmatter-body-edits
Status: closed/obsoleted · Impact: low · Complexity: small
When /sdlc:task-work ensures readiness on a worktree and start_task.ts then rebundles
readiness_verified_at onto main, the existing “lift-from-worktree” mechanism prevents
the value-level conflict but not the line-adjacency conflict. If the verify commit’s
diff carries OTHER frontmatter additions (e.g. last_reviewed) or bundled body edits
from a relevance-check refresh, git’s 3-way hunk merge declares a conflict even though
both sides agree semantically. This causes rebase pain on otherwise-clean task starts.
When the verify commit’s diff carries OTHER frontmatter additions (here: bundled body edits driven by a relevance-check refresh), git’s 3-way hunk merge declares a conflict even though both sides agree semantically. Automation gap: start_task.py could also lift last_reviewed (or any pending body-edit overlap) so the verify commit’s diff has empty intersection with the start commit’s diff at hunk granularity.
— from 2026-05-20-ontogen-ts-entity-field-type-closure in
git@github.com:sksizer/rust-ontogen.git.
TBD — receiver to fill before promoting from planning/draft.
Proposed
Section titled “Proposed”TBD — receiver to fill before promoting from planning/draft.
Approach
Section titled “Approach”TBD — receiver to fill before promoting from planning/draft.
Files to touch
Section titled “Files to touch”TBD — receiver to fill before promoting from planning/draft.
Acceptance criteria
Section titled “Acceptance criteria”TBD — receiver to fill before promoting from planning/draft.
Out of scope
Section titled “Out of scope”- none
Dependencies
Section titled “Dependencies”- none
Discovery context
Section titled “Discovery context”Spawned by /sdlc:cross-repo-task-pr on 2026-05-23 UTC from
2026-05-20-ontogen-ts-entity-field-type-closure in git@github.com:sksizer/rust-ontogen.git.