Working on multiple PRs simultaneously makes mess in commits #184

Activity

1. bradygaster

   added 4 commits that reference this issue on Mar 4, 2026

   main to dev (#299)

   ...

   08bb9fa

   Bradygaster/dev (#184)

   ...

   a20ae4e

   feat: SDK/CLI workspace migration and npm publish (#298)

   ...

   d7a0119

   feat: Squad Remote Control - PTY mirror + devtunnel for phone access (#…

   ...

   4ecc244
2. williamhallatt commented on Mar 5, 2026

   

   williamhallatt

   on Mar 5, 2026

   Contributor

   More actions

   @tomasherceg - unrelated to squad, but this is a standard inclusion I put in my AGENTS.md file for all repos that's drastically reduced the type of churn I think you are referring to. Hope it helps!

   Git Rules

   • Keep commits focused by concern
   • Delete unused or obsolete files when your changes make them irrelevant (refactors, feature removals, etc.), and revert files only when the change is yours or explicitly requested. If a git operation leaves you unsure about other agents' in-flight work, stop and coordinate instead of deleting.
   • Before attempting to delete a file to resolve a local type/lint failure, stop and ask the user. Other agents are often editing adjacent files; deleting their work to silence an error is never acceptable without explicit approval.
   • Coordinate with other agents before removing their in-progress edits—don't revert or delete work you didn't author unless everyone agrees.
   • Always double-check git status before any commit
   • Keep commits atomic: commit only the files you touched and list each path explicitly. For tracked files run git commit -m "<scoped message>" -- path/to/file1 path/to/file2. For brand-new files, use the one-liner git restore --staged :/ && git add "path/to/file1" "path/to/file2" && git commit -m "<scoped message>" -- path/to/file1 path/to/file2.
   • Never amend commits unless you have explicit written approval in the task thread.
3. bradygaster

   added

   release:deferDeferred past next releaseDeferred past next release

   squadSquad triage inbox — Lead will assign to a memberSquad triage inbox — Lead will assign to a member

   squad:kobayashi

   status:backlogBacklog itemBacklog item

   on Mar 6, 2026
4. github-actions

   added

   squad:keaton

   on Mar 7, 2026
5. github-actions commented on Mar 7, 2026

   

   github-actionsBot

   on Mar 7, 2026 – with GitHub Actions

   Contributor

   More actions

   📋 Assigned to Kobayashi (Git & Release)

   Issue: #184 — Working on multiple PRs simultaneously makes mess in commits

   Kobayashi will pick this up in the next Copilot session.

   For Copilot coding agent: If enabled, this issue will be worked automatically.
   Otherwise, start a Copilot session and say:
   Kobayashi, work on issue #184
6. github-actions

   added

   go:needs-researchNeeds investigationNeeds investigation

   on Mar 7, 2026
7. github-actions commented on Mar 7, 2026

   

   github-actionsBot

   on Mar 7, 2026 – with GitHub Actions

   Contributor

   More actions

   🏗️ Squad Triage — Keaton (Lead)

   Issue: #184 — Working on multiple PRs simultaneously makes mess in commits
   Assigned to: Keaton (Lead)
   Reason: No specific domain match — assigned to Lead for further analysis

   @copilot evaluation: No strong capability match — routed to squad member.

   Team roster:

   • Keaton (Lead) → label: squad:keaton
   • Verbal (Prompt Engineer) → label: squad:verbal
   • Fenster (Core Dev) → label: squad:fenster
   • Hockney (Tester) → label: squad:hockney
   • McManus (DevRel) → label: squad:mcmanus
   • Kujan (SDK Expert) → label: squad:kujan
   • Edie (TypeScript Engineer) → label: squad:edie
   • Kobayashi (Git & Release) → label: squad:kobayashi
   • Fortier (Node.js Runtime) → label: squad:fortier
   • Rabin (Distribution) → label: squad:rabin
   • Baer (Security) → label: squad:baer
   • Redfoot (Graphic Designer) → label: squad:redfoot
   • Strausz (VS Code Extension) → label: squad:strausz
   • Saul (Aspire & Observability) → label: squad:saul
   • Kovash (REPL & Interactive Shell) → label: squad:kovash
   • Marquez (CLI UX Designer) → label: squad:marquez
   • Cheritto (TUI Engineer) → label: squad:cheritto
   • Breedan (E2E Test Engineer) → label: squad:breedan
   • Nate (Accessibility Reviewer) → label: squad:nate
   • Waingro (Product Dogfooder) → label: squad:waingro
   • Ralph (Work Monitor) → label: squad:ralph
   • @copilot (Coding Agent) → label: squad:copilot

   To reassign, remove the current squad:* label and add the correct one.
8. bradygaster commented on Mar 7, 2026

   

   bradygaster

   on Mar 7, 2026

   Collaborator

   More actions

   Great catch on the concurrent work issue. We've been thinking about this as part of our coordination and worktree strategy. The SDK-first architecture we've been building should give us better hooks to handle parallel agent work without commit collisions. This is still on the roadmap — thanks for surfacing the problem so clearly. Feel free to check back as we roll out v0.8.23+, or let us know if you hit this issue again with specific reproduction steps. 👍
9. bradygaster

   closed this as completedon Mar 7, 2026
10. bradygaster commented on Mar 7, 2026

    

    bradygaster

    on Mar 7, 2026

    Collaborator

    More actions

    Thank you for flagging the multi-agent coordination issue, @tomasherceg! The race condition you hit—agents stepping on each other's branches and commits—is exactly the kind of real-world friction we need to smooth out. Your worktree suggestion points to a broader pattern we're building for parallel work. This is on our roadmap! Great catch. 🎯

    — McManus 📝, on behalf of the Squad