Merge branch 'develop' into v0.12.0-RC

rhornung67 · rhornung67 · commit 4d29d8b68a59 · 2025-10-02T10:56:24.000-07:00
and resolve merged conflict
diff --git a/.gitlab/build_tioga.yml b/.gitlab/build_tioga.yml
@@ -16,7 +16,7 @@
       when: never
     - when: on_success
   before_script:
-    - module load cmake/3.24.2
+    - module load cmake/3.29.2
 
 ####
 # Template
diff --git a/src/axom/sidre/core/Group.cpp b/src/axom/sidre/core/Group.cpp
@@ -1509,17 +1509,6 @@ bool Group::deepCopyToConduit(Node& dst, int tupleAllocId, int arrayAllocId, con
     {
       hasSavedViews = true;
     }
-    else
-    {
-      if(m_is_list)
-      {
-        dst.remove(group.getName());
-      }
-      else
-      {
-        dst.remove(dst.number_of_children() - 1);
-      }
-    }
   }
 
   return hasSavedViews;

Original file line number	Diff line number	Diff line change
`@@ -1509,17 +1509,6 @@ bool Group::deepCopyToConduit(Node& dst, int tupleAllocId, int arrayAllocId, con`
`1509`	`1509`	`{`
`1510`	`1510`	`hasSavedViews = true;`
`1511`	`1511`	`}`
`1512`		`- else`
`1513`		`- {`
`1514`		`- if(m_is_list)`
`1515`		`- {`
`1516`		`- dst.remove(group.getName());`
`1517`		`- }`
`1518`		`- else`
`1519`		`- {`
`1520`		`- dst.remove(dst.number_of_children() - 1);`
`1521`		`- }`
`1522`		`- }`
`1523`	`1512`	`}`
`1524`	`1513`
`1525`	`1514`	`return hasSavedViews;`