Skip to content

Commit 6e074f7

Browse files
authored
Merge pull request #33927 from davidxia/patch-2
docs: show server side apply overwrite for CLI
2 parents 1fbf428 + 69d46a7 commit 6e074f7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +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 set 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
129130
again. This forces the operation to succeed, changes the value of the field,
130131
and removes the field from all other managers' entries in managedFields.
131132

0 commit comments

Comments
 (0)