"Stashed conflicting branches" should not be shown if no conflict was resolved.

[koppor]

Version

0.12.23

Operating System

Mac OS X

Distribution Method

dmg (Apple Silicon)

Describe the issue

I resolved the "Stashed conflicting branches" by deleting the local branches (using GitButler's UI).

However, the error message keeps popping up.

How to reproduce

1. Use GitButler
2. Switch back to normal git use
3. Make PRs
4. Merge PRs
5. Delete some local branches (the ones which were merged)
6. Re-use GitButler

Expected behavior

No conflict warning message for non-existing branches.

Relevant log output

No response

[Byron]

Thanks a lot for reporting!

Looking at the steps to reproduce, I hoped that maybe they could be evolved into a clear list of things to do to get to this state. When looking at it, it would help to learn where exactly the errors show up - is it after point 6? And is it necessary to do something with these local branches in GitButler before returning to the Git workflow? After all, if GitButler never touched them, I wouldn't expect it to have issues.

Maybe someone with more knowhow would be able to derive a reproduction from the list though.

[koppor]

When looking at it, it would help to learn where exactly the errors show up - is it after point 6?

Yes. The popup is now showing up "always". I press "Dismiss" now and then, but it keeps up showing.

But I do not have these branches any more.

And is it necessary to do something with these local branches in GitButler before returning to the Git workflow?

"Only" step 5: Delete them.