Question

You run 'git rebase main' on your feature branch and the process stops with a conflict in 'config.yml'. After manually editing the file to resolve the conflict markers, which two-step sequence correctly finalizes this single conflicted commit and continues the rebase?

Accepted Answer

Run 'git add config.yml', then 'git rebase --continue'

Answer

Run 'git commit -m "fix conflict"', then 'git rebase --skip'

Answer

Run 'git checkout config.yml', then 'git rebase --continue'

Answer

Run 'git merge --continue' after 'git add config.yml'