1. Resolve the conflict and continue rebasing.
2. Drop the conflicting change and continue rebasing.
3. Abort the rebase operation.
1. Resolve the conflict and continue rebasing.
2. Drop the conflicting change and continue rebasing.
3. Abort the rebase operation.