integrate¶
Bring origin/main into the current branch by merge.
The shared-branch spelling: a merge never rewrites, so every other copy of the branch stays valid, and the squash erases the merge commit at landing. A conflict in the render's receipts alone is merged key by key and committed; any other conflict stops with git's own words: resolve, commit, and re-run.