Redirecting you to http://sites.google.com/a/insoshi.com/insoshi-guides/Git-Guides/merge-vs-rebase