merge conflict
Two branches changing the same lines, so the tool refuses to guess and hands the decision back to you.
Where it comes up
Cursor CLI
“repository. You're getting even more isolation than just like a branch, which you might have to resolve merge conflicts down the road. So, I'd recommend, you know, using this work tree command, having a bunch of different sessions When when…”
Cursor for Knowledge Work
“third-party Figma skills when working with design files um and some sub-agents for maybe working with different linear issues, for investigating logs, and for drafting customer responses. Um and then, one I use a lot is to resolve merge con…”
How Cursor uses Cursor
“Uh or you can also just work with a Cursor Cloud agent directly within your pull request. And so if I was curious about maybe a decision that the agent made uh or potentially I want the agent to resolve a merge conflict if I have that, I co…”