AZ400-Q: resolve a merge conflict safely
A pull request conflicts with a newer main branch change. What should the author do before merge?
- A) Update the branch, resolve the conflict deliberately, and rerun required validation. ✓
- B) Delete the conflicting main branch commit.
- C) Merge with conflict markers left in the source.
- D) Bypass all checks because the PR was previously approved. Answer: A. The resolved combined state, not the old PR state, needs review and validation. Why not the others: The alternatives damage history, source quality, or merge controls.