Merge origin/main into current branch

Steps

1. Fetch and attempt merge

git fetch origin main && git merge origin/main --no-edit

If the merge succeeds cleanly, skip to step 4.

If there are conflicts, git diff --name-only --diff-filter=U lists the conflicted files. Resolve them all before continuing.

2. Resolve conflicts

Read every conflicted file before editing. For each conflict, decide which strategy applies: