Skip to content

Rebase will cause conflicts #2630

@eg-pws

Description

@eg-pws

This morning, I was notified that version 2.12.2.0 was available, so I installed the update.

Now whenever I try to rebase my feature branch on the base branch, the Rebase dialog always shows a warning that "Rebase will cause conflicts".

This warning is alarming and I don't remember seeing this in previous releases, unless there actually was a conflict.

Image

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions