Skip to content

Commit

Permalink
Merge pull request #149 from terrateamio/148-fix-reduce-log-errors-on…
Browse files Browse the repository at this point in the history
…-automerge-failure

#148 FIX Make automerge failure silent
  • Loading branch information
orbitz authored Dec 12, 2024
2 parents 84921d7 + 8217bae commit 38e519b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/src/terrat/terrat_evaluator3.ml
Original file line number Diff line number Diff line change
Expand Up @@ -5469,7 +5469,7 @@ module Make (S : S) = struct
else Abb.Future.return (Ok state)
| Error (`Merge_err reason) ->
H.maybe_publish_msg ctx state (Msg.Automerge_failure (pull_request, reason))
>>= fun () -> Abb.Future.return (Error `Silent_failure)
>>= fun () -> Abb.Future.return (Error (`Noop state))
| Error `Error as err -> Abb.Future.return err
else Abb.Future.return (Ok state)
| None -> assert false)
Expand Down

0 comments on commit 38e519b

Please sign in to comment.