git-concurrency-preflight

Git concurrency pre-flight

Use this skill when git state may be shared across multiple active sessions or agents. Typical triggers:

• before starting large or multi-file uncommitted work in a shared checkout
• when told another session/agent is doing significant concurrent work
• before destructive git operations such as checkout, reset, rebase, or pull --rebase in a repo known to use concurrent sessions or many worktrees

This is repo-agnostic guidance. Agentweaver is the motivating example because it often has many .worktrees/ plus parallel Squad/Copilot sessions, but the same risk pattern applies anywhere multiple processes may touch the same clone.

Goal

Confirm whether the current working directory is isolated and whether local branch state still matches expectations before you add more uncommitted changes or run a destructive git command.

Run this exact pre-flight

git status --short --branch
git worktree list
git log <branch> -N --oneline
git log origin/<branch> -N --oneline
git stash list

Replace:

• <branch> with the current branch from git status --short --branch
• N with a small comparison window such as 5 or 10

How to interpret each result

1) git status --short --branch

Use this to confirm:

• which branch you are actually on
• whether the branch tracks a remote
• whether git reports ahead/behind/diverged state
• whether uncommitted changes are already present

Safe-ish result:

• expected branch
• no surprising ahead/behind/diverged marker
• the uncommitted diff is understood and intentionally yours

Escalate/pause if:

• the branch is not the one you expected
• git reports unexpected divergence from the tracking branch
• there is a large uncommitted diff you did not create or cannot confidently attribute

2) git worktree list

Use this to understand whether concurrent work is likely isolated in separate worktrees or happening in the exact same checkout.