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