fix
task/fix-museattributes-manual-strategy
#1 / 1
fix: change muse/core/** merge strategy from manual to auto
The manual strategy forces every path into the conflict list even when only one side changed. A pure theirs-only addition (b=None, l=None, r=<oid>) was correctly resolved by the engine but then overridden by the manual rule — producing a false conflict and causing apply_manifest to delete the file from disk.
auto lets genuine conflicts surface naturally while allowing clean additions and deletions to merge through without human intervention.
Incident: muse/core/patch_record.py was falsely conflicted and deleted from disk during every dev→main merge because of this rule.
sha256:bf409c1fe8f89b4f4927dbac38c2f6c694d8328d6f3fa5e7026f11a371d59b71
sha
sha256:08b089cc3f3d8fd5380d55cbebc349b24217bda4b2926cb4676e7c89b93559f2
snapshot
← Older
Oldest on task/fix-museattributes-manual-strategy
All commits
Newer →
Latest on task/fix-museattributes-manual-strategy
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:bf409c1fe8f89b4f4927dbac38c2f6c694d8328d6f3fa5e7026f11a371d59b71 --body "your comment"
No comments yet. Be the first to start the discussion.