diff --git a/services/shared/automerge/automerge.go b/services/shared/automerge/automerge.go index be7b2f6eb4..18601b3a45 100644 --- a/services/shared/automerge/automerge.go +++ b/services/shared/automerge/automerge.go @@ -5,6 +5,7 @@ package automerge import ( "context" + "errors" "fmt" "strconv" "strings" @@ -22,7 +23,7 @@ var PRAutoMergeQueue *queue.WorkerPoolQueue[string] func addToQueue(pr *issues_model.PullRequest, sha string) { log.Trace("Adding pullID: %d to the automerge queue with sha %s", pr.ID, sha) - if err := PRAutoMergeQueue.Push(fmt.Sprintf("%d_%s", pr.ID, sha)); err != nil { + if err := PRAutoMergeQueue.Push(fmt.Sprintf("%d_%s", pr.ID, sha)); err != nil && !errors.Is(err, queue.ErrAlreadyInQueue) { log.Error("Error adding pullID: %d to the automerge queue %v", pr.ID, err) } }