Skip to content

Frequent false positive merge conflicts #13

@bernhold

Description

@bernhold

Hi, thanks for your action!

I'm trying to use it to create an integration branch -- every time we get a PR or a push to master, we merge them into a "preview" branch. Sometimes it works as it should, but frequently, it fails, supposedly due to merge conflicts. But in nearly all of these cases, we're quite confident there's no merge conflict -- we're adding a brand new file or changing something that no other PR touches. And if we manually rebuilt the preview branch, it would be fine.

I'm wondering if you've seen this kind of behavior in other settings with this action?

Looking at the code, it is hard to see how it could go wrong here, but my colleagues and I are at a loss to understand what's happening. Thanks for any help.

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