git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merging a foreign tree into a bare repository.

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 9, 2008, 00:40 UTC
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..."

Previous: Dave QuigleyNext: Alejandro Riveira
Message 2 of 6 in “Merging a foreign tree into a bare repository.”
  1. Dave QuigleyJul 9, 2008
  2. Johannes SchindelinJul 9, 2008
  3. Alejandro RiveiraJul 9, 2008
  4. Jakub NarebskiJul 9, 2008
  5. Johannes SchindelinJul 9, 2008
  6. Eric RaibleJul 9, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.