From 0ec83f2c4b108aa139cb715e5f549e6d27e778be Mon Sep 17 00:00:00 2001 From: Tom Johnson Date: Mon, 8 Feb 2016 09:43:10 -0800 Subject: [PATCH] typo fix --- mydoc/mydoc_mercurial_collaboration.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mydoc/mydoc_mercurial_collaboration.md b/mydoc/mydoc_mercurial_collaboration.md index 944e52a..58b3f7d 100644 --- a/mydoc/mydoc_mercurial_collaboration.md +++ b/mydoc/mydoc_mercurial_collaboration.md @@ -41,10 +41,11 @@ This is my reference notes and quick reference for using Mercurial.
bookmarks:
This is a way to create branches in Mercurial. First run hg bookmark hell. Then hg checkout hell. Now you're working in hell. Then run hg bookmark --delete hell to delete hell.
-
branches
You don't really work with branches in Mercurial. If you create a branch, it's considered a separate line of code. Rarely do you merge branches back in. In this regard, Mercurial differs greatly from Git. However, Mercurial's approach to branching is that you should simply clone the repository. When you want to merge your clone, you pull changes from your clone. There's really no reason to add in this new "branching" functionality when all you're doing is basically the same clone operation. branches
You don't really work with branches in Mercurial. If you create a branch, it's considered a separate line of code. Rarely do you merge branches back in. In this regard, Mercurial differs greatly from Git. However, Mercurial's approach to branching is that you should simply clone the repository. When you want to merge your clone, you pull changes from your clone. There's really no reason to add in this new "branching" functionality when all you're doing is basically the same clone operation.
. + ## Commands | Commands | Description |