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