Téléverser les fichiers vers "yaml"
This commit is contained in:
parent
7977cbb7e9
commit
932fd19220
1 changed files with 18 additions and 0 deletions
18
yaml/merge_columns.yaml
Normal file
18
yaml/merge_columns.yaml
Normal file
|
|
@ -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
|
||||
Loading…
Add table
Reference in a new issue