The merge queue is the part that matters most and gets the least attention. Running agents in parallel is easy. Landing their changes cleanly when two agents touch overlapping files is the unsolved part. Most tools just hope it doesn't happen.

▲

rane 11 hours ago | parent | next [-]

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

	▲	Bnjoroge 7 hours ago \| parent [-]
		> 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.

▲

luca-ctx 11 hours ago | parent | prev [-]

Definitely agreed.

One thing we found works really well is having the agent read the other agent’s plan document when it hits a merge conflict, not just the diff. A lot of conflicts are hard to resolve correctly without the intent behind the change.