Git Workflow Protocol: Sandbox & Worktree Environment
You are operating in a restricted, non-interactive sandbox environment. Follow these technical constraints for all Git operations to prevent execution errors and hung processes.
1. Local-Only Worktree Operations (When SCION_GIT_DEPTH Is Unset)
- Scope: Applies to host-mounted worktree/shared sandboxes (
SCION_GIT_DEPTHunset). IfSCION_GIT_DEPTHis set, your workspace is an in-container per-agent clone — follow the project's remote policy and thegit-operationsskill (## Shallow Clones) forgit fetch --deepen/--unshallowand remote pushes. - Restriction: Host-mounted worktree sandboxes have no remote credentials and may be air-gapped from
origin;git fetch,git pull, orgit pushwill fail unless the project grants remote access. - Directive: In local worktree sandboxes, assume the local
mainbranch is the source of truth. - Command Pattern: Use
git rebase mainorgit merge maindirectly without attempting to update from a remote.
2. Worktree-Aware Branch Management
- Restriction: You are working in a Git worktree. You cannot
git checkout mainif it is already checked out in the primary directory or another worktree. - Directive: Perform comparisons, rebases, and merges from your current branch using direct references to
main. Do not attempt to switch branches to inspect code. - Reference Patterns:
- Comparison:
git diff main...HEAD(to see changes in your branch). - File Inspection:
git show main:path/to/file.ext(to view content on main without switching). - Rebasing:
git rebase main(this works from your current branch/worktree without needing to checkout main).
- Comparison:
3. Non-Interactive Conflict Resolution (Bypass Vi/Vim)
- Restriction: You cannot interact with terminal-based editors (Vi, Vim, Nano). Any command that triggers an editor will cause the process to hang.
- Directive: Use environment variables and flags to auto-author commit messages and rebase continues.
- Mandatory Syntax:
- Continue Rebase:
GIT_EDITOR=true git rebase --continue - Standard Merge:
git merge main --no-edit - Manual Commit:
git commit -m "Your message" --no-edit - Any Other Command: Set the editor via environment variable per command:
GIT_EDITOR=true git <subcommand>. Do not rely ongit -c core.editor=true <subcommand>— agent harnesses often exportGIT_EDITOR=falsein command subshells, and Git evaluatesGIT_EDITORahead of-c core.editor. - Never run
git config core.editor ...or otherwise writecore.editor,core.hooksPathor any other key outside the repository git config allow-list (pkg/util/git_config_policy.go) into the repository config: brokers refuse to start or resume an agent whose checkout sets one. Pass non-editor config flags per command (git -c <key>=<val> <subcommand>), and override the editor withGIT_EDITOR=true.
- Continue Rebase:
4. Conflict Resolution Loop
If a rebase or merge results in conflicts:
- Identify conflicted files via
git status. - Resolve conflicts in the source files.
- Stage changes:
git add <resolved-files>. - Finalize:
GIT_EDITOR=true git rebase --continue.