From 69d46a7a9874a72791ff715c4ec4eff3328c3fff Mon Sep 17 00:00:00 2001 From: David Xia Date: Tue, 24 May 2022 19:19:27 -0400 Subject: [PATCH] Update content/en/docs/reference/using-api/server-side-apply.md Co-authored-by: Antoine Pelisse --- content/en/docs/reference/using-api/server-side-apply.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/docs/reference/using-api/server-side-apply.md b/content/en/docs/reference/using-api/server-side-apply.md index cb53568f13..e9f951a76a 100644 --- a/content/en/docs/reference/using-api/server-side-apply.md +++ b/content/en/docs/reference/using-api/server-side-apply.md @@ -125,8 +125,8 @@ this occurs, the applier has 3 options to resolve the conflicts: * **Overwrite value, become sole manager:** If overwriting the value was intentional (or if the applier is an automated process like a controller) the - applier should add `--force-conflicts` to `kubectl apply` or set - the `force` query parameter to true and make the request + applier should set the `force` query parameter to true (in kubectl, it can be done by + using the `--force-conflicts` flag with the apply command) and make the request again. This forces the operation to succeed, changes the value of the field, and removes the field from all other managers' entries in managedFields.