Git Merge Origin Main

Safely bring the latest origin/main into the current non-main branch without disturbing unrelated work.

Preconditions

Before fetching or merging:

1. Confirm the current directory is a Git worktree.
2. Confirm the current branch is neither main nor detached HEAD.
3. Stop if a merge, rebase, cherry-pick, or revert is already in progress.
4. Run git status --short, which includes staged, unstaged, and untracked changes.
5. If it prints anything, stop and show the status. Do not fetch or merge. Ask the user to make the tree clean or explicitly request a separate handling strategy.

Never stash, commit, reset, clean, restore, or discard changes automatically.

Workflow