Skip to content

Commit 85b6d09

Browse files
committed
Rephrase unresolved value for the force-conflict switch
1 parent af41092 commit 85b6d09

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

keps/sig-cli/3805-ssa-default/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ trade-off: Are conflicts worth breaking people? We would also have to
147147
change the value of `--force-conflict`, which will break some people,
148148
but arguably a much smaller set of people.
149149

150-
We don't know yet, but I'll assume we don't flip the switch in the rest
151-
of the document since that use-case is more complicated.
152-
<<[/UNRESOLVED]>>
150+
We don't know yet, but I'll assume we don't flip the force-conflict
151+
switch (keep it to false) in the rest of the document since that
152+
use-case is more complicated. <<[/UNRESOLVED]>>
153153

154154
<<[UNRESOLVED Removal of CSA]>>
155155
We considered removing the

0 commit comments

Comments
 (0)