threads / discuss / 20292

Merge-base algorithm?

Subject: Merge-base algorithm?

## tl;dr

2 messages between Jul 30, 2009 and Jul 30, 2009.

replies: 1people: 1as markdown or json

Josh ben Jore· Jul 30, 2009, 04:16 UTC · lore

What is the merge-base algorithm for selecting nodes? How can I subsume nodes in the selected list?

I want to change the result of my current merge-base command. Right now it includes nodes "A", "B", and "C" and I am experiencing a segmentation fault when merging "A" and "B." I want to add a commit to the tree which subsumes nodes "A" and "B" so that my merge-base is against "new node(A+B)" and "C" or something similar.

I am attempting to work around the bug described in the thread "Null deref in recursive merge in df73af5f667a479764d2b2195cb0cb60b0b89e3d."

Regards, Josh

Josh ben Jore· Jul 30, 2009, 18:42 UTC · re: Josh ben Jore · lore

Re: Merge-base algorithm?

On 7/29/09 9:16 PM, "Josh ben Jore" <jbenjore@whitepages.com> wrote:

> What is the merge-base algorithm for selecting nodes?

Oops, my /opt/git/bin/git merge-base --help on the approximately 1.6.4 was using the documentation from the other git in /usr/bin/git. While reading the source tree, I found Documentation/git-merge-base.txt which answered this question.

The docs I'd read still said to read the source code.

Josh