Stuck at "Do you want to merge or rebase"

[richardtop]

When someone force pushes the branch I'm onto right now and then I pull the changes, I'm asked if I want to merge or rebase it:

However, clicking any of the three buttons doesn't do anything if the repository is in the state of merge conflict. The only solution is to force quit GitUp and try to switch to another branch.

[sesam]

Yep, I've seen this too. Label: bug :)
(For anyone who knows the this repo better -- does gitup have an idea of what state the repo is in, or if not, then maybe adding that can be a #good-first-issue ticket?)

[GaryElshaw]

I just experienced this too w/ 1.3.2

[peteschaffner]

I didn't take the proper time to understand the issue, but this fixed things for me:

[NikKovIos]

2022-07-05.12.26.19.mov

[lucasderraugh]

Thanks for all the input. I'll do a bit of investigation into why the alert doesn't dismiss itself.

[thl-sz]

Any updates on this issue? This is really annoying. I need to force quit the GitUp and clean up the mess in the repo which is left by that.