kitchen-merge¶
Shortcut: km
Help option
~ $ dk kitchen-merge --help
Current context is: default
Usage: dk kitchen-merge [OPTIONS]
Merge two Kitchens. Provide the names of the Source and Target Kitchens.
Options:
-sk, --source_kitchen TEXT source (from) kitchen name
-tk, --target_kitchen TEXT target (to) kitchen name [required]
-y, --yes Force yes
--help Show this message and exit.
Merge kitchens
~ $ dk kitchen-merge --source_kitchen Feature_Sprint --target_kitchen Dev_Sprint
Current context is: default
Are you sure you want to merge the Source Kitchen Feature_Sprint into the
Target Kitchen Dev_Sprint? [yes/No]yes
YYYY-MM-DD HH:MM:SS - Merging Kitchen Feature_Sprint into Kitchen Dev_Sprint
looking for merged (.base) files in temporary directory
~/.dk/merges/Feature_Sprint_to_Dev_Sprint
Calling Merge ...
variations.json 0
1 files changed, 0 insertions(+), 0 deletions(-)
Merge kitchens using shortcuts and force
~ $ dk km -sk Feature_Sprint -tk Dev_Sprint -y
Current context is: default
YYYY-MM-DD HH:MM:SS - Merging Kitchen Feature_Sprint into Kitchen Dev_Sprint
looking for merged (.base) files in temporary directory
~/.dk/merges/Feature_Sprint_to_Dev_Sprint
Calling Merge ...
variations.json 0
1 files changed, 0 insertions(+), 0 deletions(-)
Kitchen merge that generates conflict (variables.json)
~ $ dk km -sk Feature_Sprint -tk Dev_Sprint -y
Current context is: default
YYYY-MM-DD HH:MM:SS - Merging Kitchen Feature_Sprint into Kitchen Dev_Sprint
looking for merged (.base) files in temporary directory
~/.dk/merges/Feature_Sprint_to_Dev_Sprint
Calling Merge ...
1 conflict found
Conflicted files in Recipe 'Recipe1'
Recipe1/variables.json
Merge kitchens with shortcuts and contextual source kitchen option without running kitchen-merge-preview