Problem
When we fix bugs in upstream code, the current marker system treats them the same as feature additions. During upstream merges, reviewers can't distinguish "temporary bug fix that upstream may have already fixed" from "permanent feature we added". This leads to:
- Keeping our fix AND upstream's fix (duplicate/conflict)
- Not knowing when to drop our markers after upstream ships their own fix
- No easy way to audit what upstream bugs we're carrying
Solution
upstream_fix: tag convention in marker descriptions to distinguish bug fixes from features
--audit-fixes flag on analyze.ts to list all upstream bug fixes before each merge
- Documentation with when-to-use-which guidance
Also includes code review fixes from #546 that weren't included in the merge.
Problem
When we fix bugs in upstream code, the current marker system treats them the same as feature additions. During upstream merges, reviewers can't distinguish "temporary bug fix that upstream may have already fixed" from "permanent feature we added". This leads to:
Solution
upstream_fix:tag convention in marker descriptions to distinguish bug fixes from features--audit-fixesflag onanalyze.tsto list all upstream bug fixes before each mergeAlso includes code review fixes from #546 that weren't included in the merge.