{"id":"W4415896010","doi":"10.1016/j.jss.2025.112694","title":"Domain-specific conflict resolution and model merge","year":2025,"lang":"en","type":"article","venue":"Journal of Systems and Software","topic":"Model-Driven Software Engineering Techniques","field":"Computer Science","cited_by":0,"is_retracted":false,"has_abstract":true,"ca_institutions":"Université de Montréal","funders":"Mitacs","keywords":"Merge (version control); Conflict resolution; Software; Syntax; Resolution (logic); High resolution","routes":{"ca_aff":true,"ca_fund":true,"ca_venue":false,"about_ca":false,"invisible_to_affiliation_only":false},"retraction":null,"screen":null,"direct_labels":[],"prediction":{"model_version":"codex-gemma-dda1882f352a","candidate_categories":[],"consensus_categories":[],"category_scores_codex":[0.000520977,0.0001146886,0.0002758813,0.0002097271,0.00008897314,0.0001426708,0.0002662093,0.00008674964,3.385304e-7],"category_scores_gemma":[0.000005686129,0.00009565426,0.00004725385,0.0001440047,0.00003213939,0.0003355943,0.000117108,0.0001726306,3.055061e-7],"about_ca_system_candidate":false,"about_ca_system_consensus":false,"about_ca_system_score_codex":0.00005132971,"about_ca_system_score_gemma":0.00004889487,"about_ca_topic_candidate":false,"about_ca_topic_consensus":false,"about_ca_topic_score_codex":0.00000903039,"about_ca_topic_score_gemma":4.587753e-7,"domain_scores_codex":[0.9990669,0.00003817199,0.000387245,0.0001592528,0.0002078339,0.0001406264],"domain_scores_gemma":[0.9992681,0.00005202782,0.0001708588,0.0002328523,0.000191225,0.00008496174],"domain_codex":null,"domain_gemma":null,"domain_candidate":null,"domain_consensus":null,"study_design_codex":"theoretical_or_conceptual","study_design_gemma":"not_applicable","study_design_scores_codex":[0.00001939684,0.00003246037,0.001596884,0.0002500343,0.00006945617,0.00004777807,0.001211468,0.009918843,0.0006700147,0.9484584,0.01141441,0.02631085],"study_design_scores_gemma":[0.0008675156,0.0001902437,0.002379873,0.001226583,0.00002051592,0.0004742499,0.0000425416,0.1792873,0.0001306481,0.007935273,0.8071057,0.0003395942],"study_design_candidate":"theoretical_or_conceptual","study_design_consensus":null,"genre_codex":"methods","genre_gemma":"methods","genre_scores_codex":[0.014914,0.009785742,0.9745359,0.0001767702,0.0003360818,0.00009660329,0.00000243047,0.00011216,0.00004024281],"genre_scores_gemma":[0.169812,0.001271765,0.8285035,0.00005506208,0.00008507149,0.000006597979,3.599339e-7,0.00001033451,0.0002553339],"genre_candidate":"methods","genre_consensus":"methods","teacher_disagreement_score":0.9405231,"threshold_uncertainty_score":0.3900668,"prediction_status":"machine_predicted_unvalidated"},"machine_scores":{"provisional":true,"baseline":true,"maturity_gate_passed":false,"score_opus":0.01583751795481005,"score_gpt":0.2391742027505314,"score_spread":0.2233366847957214,"validation_status":"score_only:v0-immature-baseline","note":"Baseline scores from an immature model (maturity gate not passed). Scores rank; they never assert a category."}}