Skip to content
Permalink
Browse files

Merge pull request #1922 from flant/fixTypo

[3-way-merge,docs] Fix typo
  • Loading branch information
distorhead committed Nov 20, 2019
2 parents ab55ca0 + 8a6f918 commit dec15c9c4cfa7acb62a9421e90dbac66771e8900
Showing with 1 addition and 1 deletion.
  1. +1 −1 docs/pages/reference/deploy_process/resources_update_methods_and_adoption.md
@@ -55,7 +55,7 @@ Annotation `debug.werf.io/repair-messages` will contain warnings written to the

With this method werf will apply three-way-merge patches which take into accout resource version from the previous release, resource version from current chart template and live resource version from cluster to calculate a patch. This patch should transform resource state to match chart template configuration.

## Selecting sesources update method
## Selecting resources update method

To select resources update method werf has an option called `WERF_THREE_WAY_MERGE_MODE` (or `--three-way-merge-mode` cli option), which can have one of the following values:

0 comments on commit dec15c9

Please sign in to comment.
You can’t perform that action at this time.