update-from-upstream-main

Fetch the canonical remote main branch and merge it into your current branch using `git fetch <remote> main` followed by `git merge --ff-only` on main or `git merge --no-edit` on feature branches. This preserves published history without rebasing or force-pushing.

Use a normal merge from the canonical remote main into your feature branch with `git merge --no-edit <remote>/main`. This creates a merge commit that keeps the published branch history intact and can be pushed normally.

Stash staged, unstaged, and untracked changes with `git stash push --include-untracked` before the merge, record the stash commit ID, then reapply with `git stash apply --index` after the merge completes. Resolve any conflicts that arise during reapplication.

Conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) remain in files when resolution is incomplete. Search for them with ripgrep and remove them before staging the resolved files and committing the merge.

Rebasing rewrites published commit history and should be avoided on shared or pull request branches. Use merge instead to preserve history; only rebase local-only branches where force-push is acceptable.