Hi. How are you?
When I was trying to merge a branch, I ended up in this weird state where the merging modal was saying that I had “no conflicts” to resolve AND that I should “resolve conflicts before merging”, at the same time. The button to merge was disabled, and there were no actions I could do in the changes as well. The only way out I had, to not lose the changes in my branch (that had some variables as well), was to duplicate as a new file and delete the older one.
To make things worse, this has happened again, twice in the last couple of weeks.
My question is: Is this some known bug? Is there any clue on what I might be doing wrong to end up in this state?
Thanks a lot,
