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

Re: use case

From
BBlu <blu@daga.cl>
Date
Aug 24, 2006, 00:37 UTC
Message-ID
<20060824003736.GJ14223@daga.cl>
In-Reply-To
<Pine.LNX.4.63.0608212231430.28360@wbgn013.biozentrum.uni-wuerzburg.de>
On Mon, Aug 21, 2006 at 10:47:47PM +0200, Johannes Schindelin wrote:
Show 7 quoted lines
> Ideally, you really would have a common revision to start from. Since you 
> do not have that yet, you have to go low-level for the first octopus.
> 
> Suppose you have the last common version as tip of branch "ancestor", you 
> could do
> 
> 	git merge-octopus ancestor -- HEAD branch1 branch2 ...

This one didn't work. It complains about not having common ancestors too. I did a manual merge anyway.

Show 10 quoted lines
> After this -- if everything went well -- you should have a committable 
> state in the index. Before you commit, you should do
> 
> 	git rev-parse branch1 > .git/MERGE_HEAD
> 	git rev-parse branch2 >> .git/MERGE_HEAD
> 	git rev-parse branch3 >> .git/MERGE_HEAD
> 	...
> 
> to tell git that you want to commit an octopus merge. This will tell 
> git-commit what the parents of the merge are.

This trick did it. Now I have a proper merge commit with common ancestors. Thanks a lot.

-- 
Blu.
Previous: Johannes Schindelin
Message 3 of 3 in “use case”
  1. Blu CoraterAug 21, 2006
  2. Johannes SchindelinAug 21, 2006
  3. BluAug 24, 2006

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.