From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 09 Jul 2008 00:40:52 GMT
Subject: Re: Merging a foreign tree into a bare repository.
Message-ID: <alpine.DEB.1.00.0807090238561.5277@eeepc-johanness>
In-Reply-To: <1215562468.4199.26.camel@moss-terrapins.epoch.ncsc.mil>

Hi,

On Tue, 8 Jul 2008, Dave Quigley wrote:

> I tried to then merge them but you need a working directory to merge the 
> changes which makes sense.

Of course it does.  Merging runs the risk of conflicts, and you need a 
working directory for that.

> How would one go about doing this with a bare repository?

Very easy: clone it ("non-barely"), merge, and push back the results.

You _need_ a working directory for the merge.

Hth,
Dscho "who wonders what No Such Agency does with Git..."