Skip to content

merge_policy: incorporate all backport information into the bypass tokens

Ben Boeckel requested to merge ben.boeckel/ghostflow-director:bypass-token-fixes into master

Fixes a few issues:

  • branches were not sorted which could have caused expected token stability issues (we used HashMap)
  • fast-forward state is now incorporated
  • simplify main target branch by just always putting it into backports (as it is not special to the merge machinery)

Cc: @ryan.krattiger1

Merge request reports