Human team working with AI squad

[laurentkempe]

Hi,

First thanks a lot @bradygaster for this. I did some very good experimentations over the weekend on a greenfield project and on an old code base. The project look amazing 🤩

I am asking myself how is this going when you have multiple humans using the squad on different branches which later on will get merged. Will we get lots of merge conflicts on the different files created?

Thanks
Laurent

[bradygaster]

@spboyer has done this with his team. He has an interesting set of prompts he uses to make sure his agents know who the humans on the team are.

[spboyer]

There are occasions when you might encounter merge conflicts, but the squad is very good at getting latest, branching from the right trees and merging. This is actually no different than having a human team of many. The squad is excellent at rebasing their own PRs if needed - just ask them to :-).

[laurentkempe]

@spboyer could you please share the prompts that @bradygaster mentioned on his answer. I will keep in mind to ask the squad to rebase if I get into that "troubles". Thx.

[spboyer]

I would add "you" the squad like this for instance ->

Add Laurent (@laurentkempe) as a back-end and front-end developer specializing in code using Codex 5.4 and Opus 4.6. Assign him any related issues that are outstanding in the repo.

[bradygaster]

Hey @laurentkempe — great question! Glad to hear the experimentations went well! 👋

Squad absolutely supports mixed human/AI teams. Human team members appear on the roster with a 👤 badge and can be tagged by agents. The coordinator pauses for human input when work routes to them, while non-dependent work continues in parallel.

Squad handles branching, rebasing, and merging well — no different than coordinating any team. Would love to hear how your experiments progress! 🎉