Mission Run Overview
Mission Run: meta.json merge driver honours the merge base
Stop an ordinary git pull from silently undoing a mission discard by making the meta.json merge driver base-aware (#5460).
The kitty-specs meta.json git merge driver reconciles two sides without looking at the merge base, so a clone that discarded a mission and then pulls a teammate's change gets the discard reverted with exit 0 and pushes it. This mission makes the field merge base-aware so a change made on only one side survives, keeping today's precedence only for genuine conflicts.
Total Tasks
1
0 planned
In Progress
0
Review
0
Approved
0
Completed
1
100% done