Skip to content

kitchen-merge-preview

Shortcut: kmp

Help option

~ $ kitchen-merge-preview


Current context is: default
Usage: dk kmp [OPTIONS]

  Preview the merge of two Kitchens. No change will actually be applied.
  Provide the names of the Source (Child) and Target (Parent) Kitchens.

Options:
  -sk, --source_kitchen TEXT  source (from) kitchen name
  -tk, --target_kitchen TEXT  target (to) kitchen name  [required]
  -cpr, --clean_previous_run  Clean previous run of this command
  --help                      Show this message and exit.

Preview parent to child merge using contextual options; clean temp merge files from previous merge 

~/Kitchens/Dev_Sprint $ dk kitchen-merge-preview --target_kitchen Feature_Sprint --clean_previous_run


Current context is: default
YYYY-MM-DD HH:MM:SS - Previewing merge Kitchen Dev_Sprint into Kitchen Feature_Sprint
Merge Preview Results (only changed files are being displayed):
--------------------------------------------------------------

      ok                Recipe-Template/description.json
      ok                Recipe-Template/variables.json

Kitchen merge preview done.

Preview child to parent merge using explicit options and shortcuts; clean temp merge files 

~/Kitchens $ dk kmp -sk Feature_Sprint -tk Dev_Sprint -cpr


Current context is: default
YYYY-MM-DD HH:MM:SS - Previewing merge Kitchen Feature_Sprint into Kitchen Dev_Sprint
Merge Preview Results (only changed files are being displayed):
--------------------------------------------------------------

      ok                Recipe-Template/graph.json
      conflict          Recipe-Template/variables.json
      ok                Recipe-Template/variations.json
      ok                Recipe-Template/description.json

Kitchen merge preview done.

Preview child to parent merge using explicit options and shortcuts; retain temp merge files post conflict resolve

~/Kitchens $ dk kmp -sk Feature_Sprint -tk Dev_Sprint


Current context is: default
YYYY-MM-DD HH:MM:SS - Previewing merge Kitchen Feature_Sprint into Kitchen Dev_Sprint
Merge Preview Results (only changed files are being displayed):
--------------------------------------------------------------

      ok                Recipe-Template/graph.json
      resolved          Recipe-Template/variables.json
      ok                Recipe-Template/variations.json
      ok                Recipe-Template/description.json

Kitchen merge preview done.