fix(merge): write Cohen Transform conflict markers to working tree
When muse merge detected a conflict, conflicting files were left at their ours version with no markers — making it impossible to see both sides of the conflict. Fixed by running three_way_merge_lines (the Cohen Transform) over the ours/theirs/base blobs from the object store and writing the diff3-style marker output to the working tree, matching the pattern already used in checkout.py. Binary files are left at ours.
Also corrects test_conflicting_file_left_at_ours_version_on_conflict which was asserting the buggy behavior.
sha256:681cefc30edc150defde5affbfae111caa9bca1282b6f1662f08dd1f0bf5ca5b
sha
sha256:0ded11a6c78814ec95926978ece5e9dac6b3f9ee4feada182c44c3e2dc78077c
snapshot
Older
refactor(mist): replace urllib with HttpTransport for mkcert SSL…
sha256:2331ea415baf042c0c119fc219b503eb852e9973ac759feae4b903103074e0a9
All commits
Newer
feat(stage): muse code add auto-resolves conflict paths (git-idi…
sha256:45bf7b7727da29ab5c67698be748c0ab8300ce0b8523868994a4b06e54a54b4e
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:681cefc30edc150defde5affbfae111caa9bca1282b6f1662f08dd1f0bf5ca5b --body "your comment"
No comments yet. Be the first to start the discussion.