Conflicts are not a problem at all in my experience.

My setup is that I run `/merge`[1] , which will first have the agent rebase changes on base, and on conflicts, it's instructed to understand both sides before resolving, which helps it merge them cleanly. I haven't resolved conflicts manually in months and also haven't had any issues with agents resolving them incorrectly. A solved problem as far as I'm concerned.

[1]: https://workmux.raine.dev/guide/workflows#direct-merge

> it's instructed to understand both sides before resolving. This is the crux of the issue. You are delegating the resolution of conflicts to an agent, which is fine, but doesnt solve the core issue that there's no scalable way to actually do this. It is far from a solved problem lol, just because your agents havent had issues resolving them.