huskies: merge 961
This commit is contained in:
@@ -74,9 +74,8 @@ pub(super) fn has_content_conflict_failure(
|
||||
}
|
||||
// The projection does not carry the reason string; read the gate output
|
||||
// (where the merge runner persists the failure message) and scan for
|
||||
// conflict markers. NB: the key is `{story_id}:gate_output`, not `{story_id}`
|
||||
// — the latter is the story's *description* text and would never match.
|
||||
crate::db::read_content(&format!("{story_id}:gate_output"))
|
||||
// conflict markers.
|
||||
crate::db::read_content(crate::db::ContentKey::GateOutput(story_id))
|
||||
.map(|content| {
|
||||
content.contains("Merge conflict") || content.contains("CONFLICT (content):")
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user