Pushing from git worktree branches to main — Multi-Instance Conflict Recovery Guide

Pushing from git worktree branches to main TL;DR When running multiple Claude Code instances, pushing from each instance's wip branch directly to origin/main is the simplest approach. Conflicts resolve with a single git pull --rebase origin main command. Setup: Worktree Layout my_web_app/ .claude/worktrees/ instance-ps1/ ← branch: claude/ps1-wip instance-ps2/ ← branch: claude/ps2-wip instance-vscode/ ← branch: claude/vscode-wip Each instance works exclusively on its wip branch and merges into or