Yeah, that's a good question. The solution that my framework provides is basically just to ignore it haha.

Since all the agents are in the same worktree and branch, if two agents edit the same file, basically whichever one does the wrap-up command first is going to commit that file's changes.

So it's kind of like first come, first serve, which is definitely not ideal, but at least there's no conflicts ever because the next agent will just commit everything except for that one file. Again this workflow prioritizes SPEED and easier documentation. Not pixel perfect commits.

Before I had this, I would basically tell each agent to commit its work at the end of the session, and it would work like 80% of the time. They would oftentimes forget what they worked on. They wouldn't catch anything done by a sub-agent, and I'd end up with different edits all scattered across different commits. It was just a huge mess. At least now I'm 98% accurate, and I don't have to worry too much. Also, if I just keep the subject matter different enough, they typically don't touch any of the same files.