Unverified Commit 6848f938 authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

ci/github-script/merge: add TODO about second merge method 

We have not observed this merge method being used in practice, yet. Not
in the new bot, not in the old bot. It seems like auto-merge works for
all cases.
parent db8f50b4

ci/github-script/merge.js

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ async function handleMerge({ 
      log('Auto Merge failed', e.response.errors[0].message)

    }



    // TODO: Observe whether the below is true and whether manual enqueue is actually needed.

    // Auto-merge doesn't work if the target branch has already run all CI, in which

    // case the PR must be enqueued explicitly.

    // We now have merge queues enabled on all development branches, thus don't need a