Added support for rebase operation with conflicts

Also Added documentation for rebase operation and --squash option