Skip to content

Commit

Permalink
addresses changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dplumlee committed Jun 12, 2024
1 parent ffb2aa0 commit edd3b03
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 124 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ const calculateRuleInfos = (results: CalculateRuleDiffResult[]): RuleUpgradeInfo
(fieldDiff) =>
fieldDiff.has_update ||
fieldDiff.has_conflict ||
// For full transparancy we display all user-customized fields, even if nothing changes in the field's target or merged versions
// For full transparency we display all user-customized fields, even if nothing changes in the field's target or merged versions
fieldDiff.diff_outcome === ThreeWayDiffOutcome.CustomizedValueNoUpdate ||
fieldDiff.diff_outcome === ThreeWayDiffOutcome.CustomizedValueSameUpdate
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import type { ThreeVersionsOf } from '../../../../../../../common/api/detection_
import { MissingVersion } from '../../../../../../../common/api/detection_engine/prebuilt_rules/model/diff/three_way_diff/three_way_diff';
import { calculateFieldsDiffFor } from './diff_calculation_helpers';
import {
simpleDiffAlgorithm,
numberDiffAlgorithm,
simpleDiffAlgorithm,
singleLineStringDiffAlgorithm,
} from './algorithms';

Expand Down
Loading

0 comments on commit edd3b03

Please sign in to comment.