Re: [boost] [git] Mercurial? easy merging in svn, how about git/hg?

Subject: Re: [boost] [git] Mercurial? easy merging in svn, how about git/hg?
From: Stephan Menzel (stephan.menzel_at_[hidden])
Date: 2012-03-29 07:57:44

On Thu, Mar 29, 2012 at 11:41 AM, Julian Gonggrijp
<j.gonggrijp_at_[hidden]> wrote:
> Yes, as Martin explained that can be done quite conveniently with a second working copy.

You can also have multiple branches in one working copy. Git calls
that concept "tracked branches". You can have as many branches in a
(local) repository as you want and some of them, if not all, can be
tracking branches, which means when they created, they point to a
remote branch in the repo you've cloned from (aka 'origin') or indeed
any other, and pull in changes from there.

Cheers,
Stephan