Skip to content

Test Robot PR Merge Conflicts when Rolling Back #177

@aebid

Description

@aebid

Today Valeria noticed some issue with the cms-flaf-bot and specifying PRs

In tests on this PR #165 bbWW was failing the build stage when specifying Corrections_PR76.
This was due to bbWW having already commited to using Corrections_PR77 (merged and updated submodule commit sha).
The crash was then due to a merge conflict of Corrections going from PR77 back to PR76 here https://gitlab.cern.ch/cms-flaf/flaf_integration/-/pipelines/12895581

This seems to be due to the robot first checking out main (for bbWW PR77) then trying to patch the specific PR on top (for bbWW rolling back to PR76). It seems this is a vulnerability of any 'rollback' PR for the robot to test.

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions