Rebase Support

EGit now supports Rebase with options to abort, skip, and continue when rebase finds conflicts .

When conflicts are detected during rebase the following dialog presents the options how to proceed