Problem Statement
After a merge conflict, which sequence completes the merge?
Explanation
Edit to resolve, stage resolved files, then commit. During rebase, you’d use `git rebase --continue` after `git add`.
Practice Sets
This question appears in the following practice sets:
