[m-dev.] Discussion about git merge vs rebase on GHC mailing lists.

[Peter Ross]

On 24 February 2013 11:01, Paul Bone <paul at bone.id.au> wrote:
>
> A while ago we had a discussion about git merge vs git rebase.  There has
> been a similar discussion on the GHC mailing lists that people might find
> interesting.
>
I think the biggest issue with git is the learning curve.  It is a
more complex system than subversion or cvs.  The complexity means you
can do some cool things, but it does mean it takes awhile to learn
what how it works.

I found this blog post quite instructive

https://sandofsky.com/blog/git-workflow.html