Re: Merging a foreign tree into a bare repository.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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..."

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux