Merges can become more fraught with multiple engineers vibe coding on the same codebase. However, LLMs will become delegates for that too.
Conflicts are the least of our worries, and yes llms can handle that well. I’m taking about the things you can’t easily handle, the complexity that slowly overwhelms a codebase with no easy way out except a rewrite.
And a rewrite of a non-trivial application, even with the AI goodness, is still a big proposition and full of all kinds of risk. If you have a trivial application, you probably don’t have much protecting you from someone else vibing up a competing replacement either.