Problem Statement
Outline a practical process to resolve merge conflicts during a rebase.
Explanation
Run `git rebase main`; when conflict occurs: fix files, `git add <files>`, `git rebase --continue`. Use `git rebase --skip` to drop a commit if appropriate, or `git rebase --abort` to revert.
Practice Sets
This question appears in the following practice sets: