mirror of
https://github.com/storytold/designcraft.git
synced 2026-10-29 04:36:47 -06:00
Conflicts in crates/engine/src/cmd/object.rs: - Helpers: kept next's opt_u64, siblings_mut(d, spread, parent), reorder, set_layer_deep and set_layer, then added the branch's GroupPlan, group_plan, GROUP_SAME_LEVEL and can_group. The branch's siblings_mut(d, &GroupPlan) is dropped; group() calls next's helper as siblings_mut(d, plan.spread, &plan.parent). - Tests: kept next's reorder_tests and the other test modules next added, followed by the branch's group_tests module. group() and ungroup() were unchanged on next, so group() is the branch's version. cmd/mod.rs (CANT_GROUP_SELECTION, selection_reason) and lib.rs (execute_unguarded) merged without conflicts.