Comment Comment by djbender Mislav has a great article on this topic: http://mislav.uniqpath.com/2013/02/merge-vs-rebase/ parent djbender 13 years ago