gabriel / musehub public
feat BREAKING dev
AI Agent gabriel · 127 days ago · May 8, 2026 · Diff

feat: cherry_pick merge strategy — apply selected commit deltas onto to_branch

sha256:55c6d541b321a7698b8b8f774504da292321a1ef8b65538c7de54c0d1a0898d9 sha
sha256:7be989f3d19e2162cd9db8e64741b6fdfafa4a93f51d68d0c633baefb8f03406 parent
+24 ~2 symbols
sha256:e3d494213f70e2a43d703a71a1bc6dbca4a9689920185266ef766859ed20d259 snapshot
+24
symbols added
~2
symbols modified
0
dead code introduced
Semantic Changes 26 symbols
~ tests/test_merge_strategy_cherry_pick.py .py 23 symbols added
+ TestMergeCherryPick class class TestMergeCherryPick L33–136
+ test_conflict_recorded_when_to_branch_modified_same_file method method test_conflict_recorded_when_to_branch_modified_same_file L93–100
+ test_domains_merged_populated method method test_domains_merged_populated L120–126
+ test_empty_commits_raises method method test_empty_commits_raises L116–118
+ test_files_added_count_across_multiple_commits method method test_files_added_count_across_multiple_commits L128–136
+ test_multiple_commits_applied_in_order method method test_multiple_commits_applied_in_order L66–78
+ test_no_conflict_when_to_branch_has_same_content method method test_no_conflict_when_to_branch_has_same_content L102–107
+ test_second_commit_sees_state_after_first method method test_second_commit_sees_state_after_first L80–91
+ test_single_commit_adds_file method method test_single_commit_adds_file L35–41
+ test_single_commit_modifies_file method method test_single_commit_modifies_file L43–49
+ test_single_commit_removes_file method method test_single_commit_removes_file L51–57
+ test_strategy_name method method test_strategy_name L109–114
+ test_to_branch_files_untouched_when_not_in_delta method method test_to_branch_files_untouched_when_not_in_delta L59–64
+ TestStrategyRouterCherryPick class class TestStrategyRouterCherryPick L144–167
+ test_cherry_pick_empty_commits_raises method method test_cherry_pick_empty_commits_raises L163–167
+ test_cherry_pick_missing_commits_raises method method test_cherry_pick_missing_commits_raises L159–161
+ test_routes_cherry_pick method method test_routes_cherry_pick L146–157
+ _oid function function _oid L23–25
+ MergeResult import import MergeResult L12–12
+ annotations import import annotations L8–8
+ execute_merge_strategy import import execute_merge_strategy L12–12
+ merge_cherry_pick import import merge_cherry_pick L12–12
+ pytest import import pytest L10–10
~ musehub/models/musehub.py .py 1 symbol modified
~ MergeStrategy
~ musehub/services/proposal_merge_strategies.py .py 1 symbol added, 1 symbol modified
+ merge_cherry_pick function function merge_cherry_pick L533–591
~ execute_merge_strategy
← 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:55c6d541b321a7698b8b8f774504da292321a1ef8b65538c7de54c0d1a0898d9 --body "your comment"