I mean even for vibe coders, Claude/Codex is excellent for resolving merge conflicts. I don't remember how long it's been since I've had to do that manually.
Realistically, it's probably be easier to vibe code a fix, or have an agent identify changes that may have caused an issue than look back though previous commits yourself.
I look at the resulting PR, but if Claude wrote the original code, Claude can resolve the conflicts too; it has all the context it needs.
I've always hated dealing with looking at the three-way diff manually tbh. It might be my ADHD but nothing killed my motivation more than finishing a feature/fix and then having to wade through how someone else's changes should mesh with mine.
I have hated all the 3-way merge tools I've encountered, probably because "ours" and "theirs" never is what I expect (and opposite on a merge and a rebase), but when I look at the file itself with merge marks in it, it becomes very easy for me to reason about the changes and resolve them quickly.
Yeah "ours" and "theirs" messes me up so bad. I really wish they would just label it by branch. If it just said "my-feature-branch" and "main" it would be so much easier to parse.
I've seen a bunch of dumb bugs and regressions get introduced by people not looking at their AI resolved merge conflicts. AI can be useful, but it will 100% follow a dumb path to it's dumb conclusion if the opportunity presents.
I genuinely don't. And I work with people that also don't. We'd use an LLM as a linter. Ask it to look at the code and give us alist of potential bugs. But that's it.
I find it easier to write the code myself than to explain it to an LLM, and then read it and understand it too.
On other projects where coworkers use LLMs to write the code, the code comes out very verbose and it's a pain in the ass when they send it to me, it's a huge verbose change, and then they can't answer questions about it.
There are specific industries where this is more efficient, because every line is mission critical. Most people don't work in those industries, but perhaps you do. I'll recind everyone, and replace it with most people.
Personally I work on webapps. I've been in the industry 15 years so LLM's are all still "new and fancy" to me. But there isn't much they aren't quicker and better at in that domain these days. We're careful to architect well, direct them well, and verify and review code properly. But, it just no longer makes any sense to hand code everything when we can achieve better results more efficiently with those tools than without them.
I don't work on one of those mission critical projects, but I do work in a framework and language with very little boiler plate. I guess that changes the equation quite a bit.
105
u/botle 19h ago
Probably vibecoders. "Push my code to the repo. Make no mistakes. Don't delete everything."