Interesting to learn. In Mercurial (which is what I use primarily) pull does not merge unless you ask it to. Is there a list anywhere of gotchas in git for people coming from other DVCS? (i.e. things like commands with the same name that do subtly different things, such as this)
> In Mercurial (which is what I use primarily) pull does not merge unless you ask it to.
Actually, in Mercurial `pull` does not ever merge. It can update if you ask it to (with `-u`), but it won't merge.
`hg fetch` (standard extension) can merge (it's basically "pull and update, if update fails merge"), but it might go the way of the dodo pretty soon[0]
