Fix status for splitted conflicts

Peaker · Nov 23, 2024 · 6527953 · 6527953
1 parent 5950a47
commit 6527953
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Resolution.hs b/src/Resolution.hs
@@ -165,15 +165,17 @@ resolveContent opts =
         go (Left line) = NewContent mempty (unlines [line])
         go (Right conflict)
             | opts.splitMarkers =
-                r <> splitProgress
+                NewContent
+                { newContent = r.newContent
+                , result =
+                    if r.result.failedToResolve + r.result.reducedConflicts > 0
+                    then mempty {reducedConflicts = 1} -- The split is a reduction
+                    else mempty {resolvedSuccessfully = 1}
+                }
             | otherwise = resolve conflict
                 where
                     s = splitConflict conflict
                     r = foldMap resolve s
-                    splitProgress =
-                        case s of
-                        (_:_:_) -> NewContent (Result 0 1 0) mempty
-                        _ -> mempty
         resolve conflict =
             formatResolution $ resolveConflict opts $
             (if opts.lineEndings then lineBreakFix else id) $

diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
 flags: {}
 packages:
 - '.'
-resolver: lts-22.41
+resolver: lts-22.42