Hi, I started incorperating your feedback but before I send a new patch I have several questions about the trickier bits: 2009/1/28 Junio C Hamano <gitster@xxxxxxxxx>: > * The placement of this misses the case where a merge of two unrelated > histories is attempted. You would need to also have a check at "No > common ancestors found. We need a real merge." part. Won't that fall through? The if (!common) is above, and this is eventually an else if for it (see line 978) > The octopus > codepath could also end up with a fast forward or up-to-date. So this case is obviously more convoluted... If an octopus merge is chosen should it just pass --ff-only to git-merge-octopus? Or maybe it should always pass --ff-only and the various different strategies would just die unconditionally? -- 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
