[darcs-users] darcs & git

[Juliusz Chroboczek]

> [Aside: as I'm sure Julius knows, "git rebase" is your friend here.

It is, under some circumstances.

The ``under some circumstances'' is quite typical of Git merging --
there are 17 different merging commands in Git, and every one does
just the right thing under some circumstances.

Thankfully, since Git is a distributed RCS, you can work on a local
clone and experiment with the various merging strategies: there's no
risk of breaking something upstream until you do a push.  And even if
you break something upstream, Git keeps detailed history, so you can
always undo it (unlike in Darcs).

>  >   git record                               # darcs record

> "git commit", right?

Right.

                                        Juliusz