Skip to content

conflict in backport break fast-forward optimisation. #30

Description

@Carreau

When backporting the bot attempt to reuse previous clone and just do a pull.
This can fail, and then erase the full-repository and re-clone.

One of the case where this can fail, is when the previous backport did not apply cleanly and the merge conflict has not been resolved.

When this is the case we should try to cleanup the merge conflict.

Metadata

Metadata

Assignees

No one assigned

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions