convert hg repository to git

How to create a brand new git repository from an existing hg repository. This is not explained on http://hg-git.github.com/

  easy_install hg-git
  # Now edit your ~/.hgrc as per http://hg-git.github.com/

  # Now make a bare git repository. Yes, bare.
  git init --bare ~/my-git-repo    # the --bare is important …
more ...

Git rebase conflicts

A couple of coworkers (Sean O'Connor, Dan Frank) bailed me out of a sticky git scenario. I'd been working on a branch for way too long and somebody else made wildly incompatible changes to a couple of the more important files I'd changed. When this happens, I'm prepared to accept …

more ...