From: Alex Riesen <raa.lkml@gmail.com>
Date: Sun, 17 Jun 2007 09:45:21 GMT
Subject: Re: merge into branch currently not active / checked out
Message-ID: <20070617094521.GA2763@steel.home>
In-Reply-To: <20070617072225.GF23473@cip.informatik.uni-erlangen.de>

Thomas Glanzmann, Sun, Jun 17, 2007 09:22:25 +0200:
> Hello,
> is it possible to merge into a branch currently not active/checked out?

not in current implementation of merge algorithms and conflict
handling.

> I want to merge master in every of the feature branches. Is that possible or
> just bullshit because I don't have a working tree to handle conflicts?

You are _very_ welcome to improve this :) It's not very often need, so
people just do without it (i.e. clone the repo, do a merge there and
pull back).