2025-09-03 10:16:16 +02:00
13 changed files with 27 additions and 6 deletions
--- a/examples/cpp/failing/field_visibility_conflict/Base.cc
+++ b/examples/cpp/failing/field_visibility_conflict/Base.cc
--- a/examples/cpp/failing/field_visibility_conflict/ExpectedCurrently.cc
+++ b/examples/cpp/failing/field_visibility_conflict/ExpectedCurrently.cc
@ -0,0 +1,11 @@
+class MyClass {
+    public:
+        int field_1;
+<<<<<<< LEFT
+    private:
+        size_t field_2;
+||||||| BASE
+=======
+    char field_3;
+>>>>>>> RIGHT
+}
--- a/examples/cpp/failing/field_visibility_conflict/ExpectedIdeally.cc
+++ b/examples/cpp/failing/field_visibility_conflict/ExpectedIdeally.cc
--- a/examples/cpp/failing/field_visibility_conflict/Left.cc
+++ b/examples/cpp/failing/field_visibility_conflict/Left.cc
--- a/examples/cpp/failing/field_visibility_conflict/Right.cc
+++ b/examples/cpp/failing/field_visibility_conflict/Right.cc
--- a/examples/cpp/failing/positional_argument_in_initializer_list/Base.c
+++ b/examples/cpp/failing/positional_argument_in_initializer_list/Base.c
--- a/examples/cpp/failing/positional_argument_in_initializer_list/ExpectedCurrently.c
+++ b/examples/cpp/failing/positional_argument_in_initializer_list/ExpectedCurrently.c
@ -0,0 +1,11 @@
+my_struct_t instance = {
+<<<<<<< LEFT
+   "hello",
+    "merhaba",
+||||||| BASE
+   "hello"
+=======
+   "hello",
+   "salut",
+>>>>>>> RIGHT
+};
--- a/examples/cpp/failing/positional_argument_in_initializer_list/ExpectedIdeally.c
+++ b/examples/cpp/failing/positional_argument_in_initializer_list/ExpectedIdeally.c
--- a/examples/cpp/failing/positional_argument_in_initializer_list/Left.c
+++ b/examples/cpp/failing/positional_argument_in_initializer_list/Left.c
--- a/examples/cpp/failing/positional_argument_in_initializer_list/Right.c
+++ b/examples/cpp/failing/positional_argument_in_initializer_list/Right.c
--- a/examples/csharp/failing/methods_with_comments/ExpectedCurrently.cs
+++ b/examples/csharp/failing/methods_with_comments/ExpectedCurrently.cs
@ -28,7 +28,7 @@ public partial class MyClass : IMyInterface
    /// </summary>
    [MyCustomAttribute]
    public string? MyProp { get; set; }
-
 >>>>>>> RIGHT
+
    private record MyPrivateRecord(bool Foo);
 }
--- a/examples/php/failing/methods_with_doc_comments/ExpectedCurrently.php
+++ b/examples/php/failing/methods_with_doc_comments/ExpectedCurrently.php
@ -9,8 +9,8 @@ class App {
 ||||||| BASE
 =======
    public function baz(string $param) {}
-
 >>>>>>> RIGHT
+
    public function bar() {}
 }
 ?>
--- a/src/tree_builder.rs
+++ b/src/tree_builder.rs
@ -258,15 +258,14 @@ impl<'a, 'b> TreeBuilder<'a, 'b> {

                    if let PCSNode::Node { node: leader, .. } = node
                        && let Some(commutative_parent) = leader.commutative_parent_definition()
-                    {
-                        // knowing that the order of all elements of the conflict does not matter, solve the conflict
-                        let solved_conflict = self.commutatively_merge_lists(
+                        && let Ok(solved_conflict) = self.commutatively_merge_lists(
                            &base,
                            &left,
                            &right,
                            commutative_parent,
                            visiting_state,
-                        )?;
+                        )
+                    {
                        children.extend(solved_conflict);
                    } else {
                        children.extend(MergedTree::new_conflict(