3 ms·
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 peop
by ZoFreX 15y ago
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)
- dexen 15y agoRegretable case of different name for same functionality. May indeed be misleading if you switch back-and-forth between SCMs. hg pull == git fetch git pull == { hg pull; hg merge; }
- cpeterso 15y agoAnd from masklinn's comment above, it sounds like `hg fetch` == `git pull`!
- masklinn 15y ago> 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] [0] http://www.selenic.com/pipermail/mercurial-devel/2011-August/033764.html http://www.selenic.com/pipermail/mercurial-devel/2011-August...
- ZoFreX 15y agoMea culpa, absolutely correct.