fix
BREAKING
merge
task/museattributes-permutations
#1 / 1
fix(merge): honor deletions in ours/theirs strategies; pyproject.toml = manual
- CodePlugin.merge: fix ours/theirs strategies to pop path when the chosen side deleted the file (l is None / r is None). The old 'l or b or ""' pattern fell back to base content, silently resurrecting deleted files. - .museattributes: change pyproject.toml rule from 'ours' to 'manual'. 'ours' silently discards incoming dependency changes from feature branches — a data integrity risk in an agent-first workflow. 'manual' forces human review on any merge that touches pyproject.toml. - tests/test_code_plugin_attributes.py: 101 tests covering all 12 change scenarios × 6 strategies, plus full coverage of every active .museattributes rule. The ours_deleted and theirs_deleted tests were RED before this fix.
sha256:9a4b378124ff81e66ed120cd0fa6620bc5841d7a6dceb678e512fedff492eef8
sha
sha256:5daae3bb909a88e0d8abda64d6e48bc612c04314ef65f0c4eb2c5c100e2f092e
snapshot
← Older
Oldest on task/museattributes-permutations
All commits
Newer →
Latest on task/museattributes-permutations
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:9a4b378124ff81e66ed120cd0fa6620bc5841d7a6dceb678e512fedff492eef8 --body "your comment"
No comments yet. Be the first to start the discussion.