Update comments related to ThreeWayDiff

elastic · Sep 16, 2024 · 6479c09 · 6479c09
1 parent 6483996
commit 6479c09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...on/common/api/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff.ts b/...on/common/api/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff.ts
@@ -131,6 +131,7 @@ export interface ThreeWayDiff<TValue> {
    * True if:
    *   - base=A, current=A, target=B
    *   - base=A, current=B, target=C
+   *   - base=<missing>, current=A, target=B
    */
   has_update: boolean;
 

diff --git a/.../api/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff_conflict.ts b/.../api/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff_conflict.ts
@@ -7,8 +7,8 @@
 
 /**
  * Enum of possible conflict outcomes of a three-way diff:
- *   - NON_SOLVABLE_CONFLICT: current != target and we couldn't automatically resolve the conflict between them
- *   - SOLVABLE_CONFLICT: current != target and we automatically resolved the conflict between them
+ *   - NON_SOLVABLE: current != target and we couldn't automatically resolve the conflict between them
+ *   - SOLVABLE: current != target and we automatically resolved the conflict between them
  *   - NO_CONFLICT:
  *       - current == target (value won't change)
  *       - current != target && current == base (stock rule will get a new value)