logo       

Merge-base algorithm?: msg#01876

git

Subject: Merge-base algorithm?

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

<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

News | Mail Home | sitemap | FAQ | advertise