GIT: Handling a conflict during a rebase operation

If a conflict occurs during a rebase operation, the rebase operation stops and the developer needs to resolve the conflict. After he has solved the conflicts, the developer instructs Git to continue with the rebase operation.

A conflict during a rebase operation is solved similarly to the way a conflict during a merge operation is solved. The developer edits the conflicts and adds the files to the Git index. Afterwards he continues the rebase operation with the following command.

# rebase conflict is fixed, continue with the rebase operation
git rebase --continue

To see the files which have a rebase conflict use the following command.

# lists the files which have a conflict
git diff --name-only --diff-filter=U

You solve such a conflict the same way as you would solve a merge conflict.

You can also skip the commit which creates the conflict.

# skip commit which creates the conflict
git rebase --skip