From 932fd1922043e528e71014bdac7168f09a537b06 Mon Sep 17 00:00:00 2001
From: rvba <mil01@free.fr>
Date: Mon, 23 Mar 2026 20:27:23 +0100
Subject: [PATCH] =?UTF-8?q?T=C3=A9l=C3=A9verser=20les=20fichiers=20vers=20?=
 =?UTF-8?q?"yaml"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yaml/merge_columns.yaml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 yaml/merge_columns.yaml

diff --git a/yaml/merge_columns.yaml b/yaml/merge_columns.yaml
new file mode 100644
index 0000000..3f687cb
--- /dev/null
+++ b/yaml/merge_columns.yaml
@@ -0,0 +1,18 @@
+src: ifc/office_level_0.ifc
+
+operations:
+  - name: Three-way merge of office_level_0 and office_level_columns
+    command: merge-ifc
+    base: ifc/office_level_0.ifc
+    local: ifc/office_level_0.ifc
+    remote: ifc/office_level_columns.ifc
+    output: ifc/office_level_merged.ifc
+
+  - name: Show diff between source and merged result
+    command: diff
+    input: ifc/office_level_0.ifc
+    target: ifc/office_level_merged.ifc
+    output: office_level_merged.diff
+    verbose: true
+
+dest: ifc/office_level_merged.ifc