Zed@zed.dev18 MarHit a merge conflict? Let the agent sort it out via the new 'Resolve with Agent' option.3338
futureboy1983.bsky.social@futureboy1983.bsky.social18 MarI'll resolve it myself, because I'm perfectly capable and have greater contextual knowledge24
Sam 💛@samhh.comLet’s not pretend like conflict markers aren’t frequently incomprehensible.18/3/26, 4:56 pm·0 reposts·0 likes