Post

Hit a merge conflict? Let the agent sort it out via the new 'Resolve with Agent' option.

18/3/26, 3:49 pm3 reposts38 likes

@-mention your branch diff to give the agent full context on everything you've changed since main.

Delete git worktrees directly from the branch picker (`cmd-shift-backspace`). Thanks davidalecrim1!

Download Zed and view the full changelog here: zed.dev/releases/sta...

#ZedEditor

I'll resolve it myself, because I'm perfectly capable and have greater contextual knowledge

Sure. But do you don't have 3 screens and 20 agents writing code you're not reading 😅

I have one screen and I write the code. I have a good time. What's your point?

A very important one. But I think u missed it

Let’s not pretend like conflict markers aren’t frequently incomprehensible.

Are there keybindings for these conflict buttons?