Where does the bug appear (feature/product)?
Cursor IDE
Describe the Bug
There’s no way to resolve merge conflicts starting today. The button to mark as resolved disappeared
Steps to Reproduce
Try to fix a merge conflict in the IDE
Operating System
MacOS
Current Cursor Version (Menu → About Cursor → Copy)
the latest. I just updated
Does this stop you from using Cursor
Yes - Cursor is unusable