patch
test_proposal_reimagination_phase3.py
6 days ago
replace
classify_domain
6 days ago
replace
ConflictEntry
6 days ago
replace
execute_merge_strategy
6 days ago
delete
merge_domain_selective
6 days ago
insert
merge_overlay
6 days ago
replace
merge_phased
6 days ago
insert
merge_replay
6 days ago
replace
MergeResult
6 days ago
insert
merge_selective
6 days ago
delete
merge_state_overlay
6 days ago
delete
merge_state_rebase
6 days ago
delete
merge_state_weave
6 days ago
insert
merge_weave
6 days ago
replace
paths_for_domains
6 days ago
replace
TestDomainSelective
6 days ago
replace
TestDomainSelective.test_conflict_recorded_when_ancestor_provided
6 days ago
replace
TestDomainSelective.test_domains_merged_lists_selected
6 days ago
replace
TestDomainSelective.test_empty_selective_domains_raises
6 days ago
replace
TestDomainSelective.test_files_skipped_counted
6 days ago
replace
TestDomainSelective.test_non_selected_files_unchanged
6 days ago
replace
TestDomainSelective.test_selected_domain_applied
6 days ago
replace
TestDomainSelective.test_strategy_name
6 days ago
replace
TestMergeProposalStrategyIntegration
6 days ago
replace
TestMergeProposalStrategyIntegration.test_domain_selective_only_applies_selected_domain
6 days ago
replace
TestStateOverlay
6 days ago
replace
TestStateOverlay.test_conflicts_when_ancestor_provided
6 days ago
replace
TestStateOverlay.test_counts
6 days ago
replace
TestStateOverlay.test_domains_merged_populated
6 days ago
replace
TestStateOverlay.test_from_only_files_added
6 days ago
replace
TestStateOverlay.test_from_wins_shared_file
6 days ago
replace
TestStateOverlay.test_no_conflicts_without_ancestor
6 days ago
replace
TestStateOverlay.test_no_conflict_when_only_one_side_changed
6 days ago
replace
TestStateOverlay.test_strategy_name
6 days ago
replace
TestStateOverlay.test_to_only_files_preserved
6 days ago
replace
TestStateRebase
6 days ago
replace
TestStateRebase.test_conflict_when_both_modified_same_file
6 days ago
replace
TestStateRebase.test_from_delta_applied_onto_to
6 days ago
replace
TestStateRebase.test_from_removal_applied
6 days ago
replace
TestStateRebase.test_strategy_name
6 days ago
replace
TestStateRebase.test_to_only_changes_preserved
6 days ago
replace
TestStateWeave
6 days ago
replace
TestStateWeave.test_clean_from_change_applied
6 days ago
replace
TestStateWeave.test_clean_to_change_preserved
6 days ago
replace
TestStateWeave.test_from_deletion_honoured
6 days ago
replace
TestStateWeave.test_new_file_from_only_added
6 days ago
replace
TestStateWeave.test_strategy_name
6 days ago
replace
TestStateWeave.test_to_deletion_honoured_when_from_untouched
6 days ago
replace
TestStateWeave.test_true_conflict_recorded_from_wins
6 days ago
replace
TestStateWeave.test_unchanged_file_kept
6 days ago