gabriel / muse public
feat patch stage dev
AI Agent gabriel · 110 days ago · May 26, 2026 · Diff

feat(stage): muse code add auto-resolves conflict paths (git-idiomatic)

In git, `git add <file>` after editing a conflict is the resolution signal — no separate step. muse code add now does the same: any staged file that appears in MERGE_STATE conflict_paths is removed from that list automatically, so `muse commit` can proceed without an explicit `muse resolve`.

muse resolve remains available as an explicit escape hatch for --all, symbol-level resolution, and agent workflows.

sha256:45bf7b7727da29ab5c67698be748c0ab8300ce0b8523868994a4b06e54a54b4e sha
sha256:681cefc30edc150defde5affbfae111caa9bca1282b6f1662f08dd1f0bf5ca5b parent
+30 ~1 symbols
sha256:6638c43f9db336c22e0a90e6f8973fc2905c02bd97a75a6fb381042022fce908 snapshot
+30
symbols added
~1
symbol modified
0
dead code introduced
Semantic Changes 31 symbols
~ tests/test_code_add_resolves_conflicts.py .py 30 symbols added
+ Manifest variable variable Manifest L25–25
+ TestCodeAddClearsConflictPath class class TestCodeAddClearsConflictPath L126–271
+ test_code_add_dot_clears_all_conflict_files method method test_code_add_dot_clears_all_conflict_files L225–258
+ test_no_merge_in_progress_code_add_is_unaffected method method test_no_merge_in_progress_code_add_is_unaffected L260–271
+ test_staging_conflict_file_allows_commit method method test_staging_conflict_file_allows_commit L142–158
+ test_staging_conflict_file_removes_it_from_conflict_paths method method test_staging_conflict_file_removes_it_from_conflict_paths L128–140
+ test_staging_conflict_file_sets_ready_to_commit_when_last_conflict method method test_staging_conflict_file_sets_ready_to_commit_when_last_conflict L160–174
+ test_staging_non_conflict_file_does_not_touch_merge_state method method test_staging_non_conflict_file_does_not_touch_merge_state L176–188
+ test_staging_one_of_two_conflict_files_leaves_other_unresolved method method test_staging_one_of_two_conflict_files_leaves_other_unresolved L190–223
+ _do_conflicted_merge function function _do_conflicted_merge L101–118
+ _env function function _env L97–98
+ _init_repo function function _init_repo L33–48
+ _make_commit function function _make_commit L57–94
+ _write_blob function function _write_blob L51–54
+ cli variable variable cli L23–23
+ CliRunner import import CliRunner L16–16
+ annotations import import annotations L9–9
+ blob_id import import blob_id L17–17
+ datetime import import datetime L11–11
+ fake_id import import fake_id L17–17
+ heads_dir import import heads_dir L19–19
+ json import import json L12–12
+ muse_dir import import muse_dir L19–19
+ pathlib import import pathlib L13–13
+ pytest import import pytest L15–15
+ read_merge_state import import read_merge_state L20–20
+ ref_path import import ref_path L19–19
+ write_merge_state import import write_merge_state L20–20
+ write_object import import write_object L18–18
+ runner variable variable runner L22–22
~ muse/cli/commands/code_stage.py .py 1 symbol modified
~ run_add
← Older Oldest on dev
All commits
Newer → Latest on dev

0 comments

No comments yet. Be the first to start the discussion.

To add a comment, use the Muse CLI: muse hub commit comment sha256:45bf7b7727da29ab5c67698be748c0ab8300ce0b8523868994a4b06e54a54b4e --body "your comment"