Skip to content

[Feature] forecast merge conflicts #604

Open
@andreashe

Description

@andreashe

After autoupdate remote branches;

  • check if a fast forward merge would not work, then:
  • indicate that with a new "warning" icon.

That means for example, if someone pushed a change into a file, working at the sames lines, a fast-forward merge would not work. So an optical indicator would tell me that manual merge will be required if I push to same branch.

Would be good to let define which branches it should test, like:
[x] current branch
[x] main branches (defineable, like master,main,dev, ...)

Metadata

Metadata

Assignees

No one assigned

    Projects

    Status

    Backlog

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions