Skip to content

GitHub erroneously identifying merge conflicts with Profile changes #169

@kduffey-cbobs

Description

@kduffey-cbobs

GitHub identified merge conflicts and is blocking promotion after committing Profiles metadata. The code in each profile-meta.xml file is the same on both sides of the conflict. Code inside of the identified conflicts looks like this:

Image

Result is that I have to make 150+ clicks to resolve each error in GitHub. Is this intended behavior?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions