API error: (save_edit_and_return_to_workspace)

[BenedictNaebers]

Version

0.15.17

Operating System

Windows

Distribution Method

msi (Windows)

Describe the issue

Applying a branch with a merge conflict. After clicking resolve i resolve the conflict in IntelliJ uisng the resolve conflict dialouge. When trying to click save and exit i get the following error
command: save_edit_and_return_to_workspace

params: {"projectId":"2453053b-7321-4e62-b513-b969d24a64ea"})

Encountered conflict when merging tree 468f33ba317bf4aac91ba0828fea2eaf61f3bf7e and tree 468f33ba317bf4aac91ba0828fea2eaf61f3bf7e

I dont know if this has anything to do with this or is normal behaviour tbh but when i look at the gitbutler/workspace commit it show me 3 incoming commits and 140 outgoing commits.

How to reproduce (Optional)

No response

Expected behavior (Optional)

No response

Relevant log output (Optional)

[Byron]

Thanks a lot for reporting!

It seems that the resolution is triggering additional conflicts when trying to re-merge the workspace commit. I wonder what happens then - will it leave the conflicting stack unapplied and apply the rest, or is the application in something that looks like an invalid state?

[BenedictNaebers]

Nothing really happens - im in the merge conflicts view until i press cancel. Then it returns to the standard view.
I think this is part of a larger problem, a couple of days ago i accidentally pushed changes to the gitbutler/workspace branch using the commandline. Since then ive encountered some weird behaviour. I tried to fix my merge conflic manually using the command line which left me in an invalid state with my IDE reporting 490000 untracked files and 19000 changes.
Only after deleting and re-cloning my project i was able to fix this.