test: Phase 1 TDD — MergeEngine class, --strategy, --on-conflict, --history (all RED)
sha256:e7283cd82f2f9cef3de581b97fd8ac849509ccc66861b6c81680144ffcd166c3
sha
+65
symbols
1071 changed · 1071 in snapshot
files
sha256:83059036a2bca8b05dbb31841656000cf4ff4cf5e442c8d320917ee6ca3f4e90
snapshot
+65
symbols added
1071
files changed
1071
files in snapshot
0
dead code introduced
Semantic Changes
65 symbols
+
test_HI_06_history_merge_produces_two_parent_commit
method
method test_HI_06_history_merge_produces_two_parent_commit L491–506
+
test_HI_07_history_squash_produces_single_parent_commit
method
method test_HI_07_history_squash_produces_single_parent_commit L508–523
+
test_HI_08_json_output_includes_history
method
method test_HI_08_json_output_includes_history L525–533
+
test_ME_07_strategy_lookup_table_exists
method
method test_ME_07_strategy_lookup_table_exists L152–158
+
test_ME_08_recursive_is_three_way_escalate
method
method test_ME_08_recursive_is_three_way_escalate L160–165
+
test_ME_09_overlay_is_snapshot_prefer_theirs
method
method test_ME_09_overlay_is_snapshot_prefer_theirs L167–172
+
test_ME_10_snapshot_is_snapshot_escalate
method
method test_ME_10_snapshot_is_snapshot_escalate L174–179
+
test_ME_11_replay_is_replay_ours_escalate
method
method test_ME_11_replay_is_replay_ours_escalate L181–186
+
test_ME_12_old_names_not_in_strategy_map
method
method test_ME_12_old_names_not_in_strategy_map L188–192
+
test_OC_02_on_conflict_escalate_accepted
method
method test_OC_02_on_conflict_escalate_accepted L335–341
+
test_OC_04_on_conflict_theirs_accepted
method
method test_OC_04_on_conflict_theirs_accepted L351–357
+
test_OC_05_on_conflict_invalid_rejected
method
method test_OC_05_on_conflict_invalid_rejected L359–365
+
test_OC_06_on_conflict_ours_resolves_conflict
method
method test_OC_06_on_conflict_ours_resolves_conflict L367–375
+
test_OC_07_on_conflict_theirs_resolves_conflict
method
method test_OC_07_on_conflict_theirs_resolves_conflict L377–385
+
test_OC_08_escalate_surfaces_conflict
method
method test_OC_08_escalate_surfaces_conflict L387–397
+
test_OC_09_strategy_ours_alias_equals_on_conflict_ours
method
method test_OC_09_strategy_ours_alias_equals_on_conflict_ours L399–413
+
test_OC_10_json_output_includes_on_conflict
method
method test_OC_10_json_output_includes_on_conflict L415–423
+
test_ST_01_strategy_recursive_accepted
method
method test_ST_01_strategy_recursive_accepted L218–225
+
test_ST_03_strategy_snapshot_accepted
method
method test_ST_03_strategy_snapshot_accepted L236–244
+
test_ST_09_json_output_includes_strategy
method
method test_ST_09_json_output_includes_strategy L292–300
Files Changed
+1071
1071 in snapshot
+1071
1071 in snapshot
+
LICENSE
← Older
Oldest on task/phase1-merge-engine
All commits
Newer
feat: Phase 1 — MergeEngine class, --on-conflict, --history flag…
sha256:981b89ffe0b877cbb076d011e5d9148ad88c255b66a4eef5cafac7f11ce26ab1
0 comments
To add a comment, use the Muse CLI:
muse hub commit comment sha256:e7283cd82f2f9cef3de581b97fd8ac849509ccc66861b6c81680144ffcd166c3 --body "your comment"
No comments yet. Be the first to start the discussion.