fix: consider merge conflict done

yjp20 · yjp20 · commit d767ea95a99a · 2025-12-01T14:13:09.000-08:00
diff --git a/pkg/stainlessutils/stainlessutils.go b/pkg/stainlessutils/stainlessutils.go
@@ -225,7 +225,10 @@ func (bt *BuildTarget) IsCompleted() bool {
 		if !gjson.Get(bt.RawJSON(), step).Exists() {
 			continue
 		}
-		status, _, _ := bt.StepInfo(step)
+		status, _, conclusion := bt.StepInfo(step)
+		if conclusion == "merge_conflict" {
+			return true
+		}
 		if status != "completed" {
 			return false
 		}

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,10 @@ func (bt *BuildTarget) IsCompleted() bool {`
`225`	`225`	`if !gjson.Get(bt.RawJSON(), step).Exists() {`
`226`	`226`	`continue`
`227`	`227`	`}`
`228`		`- status, _, _ := bt.StepInfo(step)`
	`228`	`+ status, _, conclusion := bt.StepInfo(step)`
	`229`	`+ if conclusion == "merge_conflict" {`
	`230`	`+ return true`
	`231`	`+ }`
`229`	`232`	`if status != "completed" {`
`230`	`233`	`return false`
`231`	`234`	`}`