file-resolve

Shortcut: fr

Help option

~ $ dk file-resolve --help


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

  Mark a conflicted file within a Recipe as resolved, so that a merge
  can be completed.

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

Resolve file conflicts using shortcut

~/Kitchens/Feature_Sprint/Recipe1 $ dk fr variables.json


Current context is: default
YYYY-MM-DD HH:MM:SS - Resolving conflicts:

1 conflict resolved
    Conflicted files in recipe 'Recipe1'
        Recipe1/variables.json