Skip to content

file-merge

Shortcut: fm

Help option

~ $ dk file-merge --help


Current context is: default
Usage: dk file-merge [OPTIONS] FILEPATH

  To be used after kitchen-merge-preview command. Launch the merge tool of
  choice, to resolve conflicts. File path needs to be stated as it is coming
  from kitchen-merge-preview output.

Options:
  -sk, --source_kitchen TEXT  source (from) kitchen name  [required]
  -tk, --target_kitchen TEXT  target (to) kitchen name  [required]
  --help                      Show this message and exit.

Merge two files using contextual option for source kitchen with PyCharm as merge tool

~/Kitchens/Feature_Sprint $ dk file-merge --target_kitchen Dev_Sprint Recipe1/variables.json


Current context is: default
YYYY-MM-DD HH:MM:SS - File Merge for file Recipe1/variables.json, source kitchen (Feature_Sprint), target kitchen(Dev_Sprint)
Executing command: /usr/local/bin/charm merge {USER_HOME}/.dk/merges/Feature_Sprint_to_Dev_Sprint/Recipe1/variables.json.left {USER_HOME}/.dk/merges/Feature_Sprint_to_Dev_Sprint/Recipe1/variables.json.base {USER_HOME}/.dk/merges/Feature_Sprint_to_Dev_Sprint/Recipe1/variables.json.right

File merge done. Remember to mark the file as resolved with the command: dk file-resolve

Merge two files using explicit options and shortcutes with PyCharm as merge tool

~/Kitchens $ dk fm -sk Feature_Sprint -tk Dev_Sprint Recipe1/variables.json


Current context is: default
YYYY-MM-DD HH:MM:SS - File Merge for file Recipe1/variables.json, source kitchen (Feature_Sprint), target kitchen(Dev_Sprint)
Executing command: /usr/local/bin/charm merge {USER_HOME}/.dk/merges/Feature_Sprint_to_Dev_Sprint/Recipe1/variables.json.left {USER_HOME}/.dk/merges/Feature_Sprint_to_Dev_Sprint/Recipe1/variables.json.base {USER_HOME}/.dk/merges/Feature_Sprint_to_Dev_Sprint/Recipe1/variables.json.right

File merge done. Remember to mark the file as resolved with the command: dk file-resolve