How are conflicts resolved when performing a rebase command?

When executing the git rebase command, Git attempts to apply commits from the current branch on top of another branch, changing their base. If the changes in the commits conflict with the changes in the target branch, a conflict occurs.

Conflict resolution proceeds as follows:

1. Git stops the rebase process and reports files with conflicts.
2. The developer manually opens the conflicting files and resolves the conflicts by choosing the correct changes or merging them.
3. After resolving conflicts, run git add <files> to mark conflicts as resolved.
4. Then continue the rebase with the command git rebase --continue.

If there are too many conflicts or the process needs to be aborted, you can run git rebase --abort to return to the original state.

Thus, conflict resolution during rebase is a manual intervention by the developer to correctly merge changes and then continue the process.