Upstream Fork Changes (Local-to-Local)

Both repos are checked out locally. No rsync. Use git format-patch / git am to move changes between them, with Claude filtering out personal/private content before anything is committed.

See also:

• /fork-merge-plan — run this first when the target has significant divergence; it produces a conflict map and commit classification before you touch any branches
• /sync-remotes — use instead when both repos are equally canonical (public, bidirectional, no filtering needed)
• /git-worktrees — for creating the upstream branch in isolation

Step 1: Establish Source and Target

SOURCE_REPO=/path/to/source     # e.g. /Users/tylerstapler/Documents/personal-wiki
TARGET_REPO=/path/to/target     # e.g. /Users/tylerstapler/IdeaProjects/markdown-confluence
TARGET_BRANCH=main