Skip to content

Commit 69d46a7

Browse files
davidxiaapelisse
andauthored
Update content/en/docs/reference/using-api/server-side-apply.md
Co-authored-by: Antoine Pelisse <[email protected]>
1 parent 5846916 commit 69d46a7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

content/en/docs/reference/using-api/server-side-apply.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ this occurs, the applier has 3 options to resolve the conflicts:
125125

126126
* **Overwrite value, become sole manager:** If overwriting the value was
127127
intentional (or if the applier is an automated process like a controller) the
128-
applier should add `--force-conflicts` to `kubectl apply` or set
129-
the `force` query parameter to true and make the request
128+
applier should set the `force` query parameter to true (in kubectl, it can be done by
129+
using the `--force-conflicts` flag with the apply command) and make the request
130130
again. This forces the operation to succeed, changes the value of the field,
131131
and removes the field from all other managers' entries in managedFields.
132132

0 commit comments

Comments
 (0)