On 1/19/06, Junio C Hamano <junkio@cox.net> wrote: > Arch star-merge is not an octopus. They have different "merge > strategy" just like we have more than one. No, I do not > remember the details of how they do it. In Arch, star-merge is roughly equivalent to git-merge. When I was an Arch user, I could go out and take a walk under the stars while it tried to work its magic on my 10K file tree -- so the name was quite fitting ;-) The main difference with git is that it has explicit rename tracking and explicit "patches already applied" tracking. We detect those things at merge time, and in my projects it has so far worked better than tla's explicit tracking of things -- but only when I merge with git-merge. One of these days I'll convince Pasky to use git-merge for cg-merge's internals. cheers, martin - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Thu Jan 19 05:06:41 2006
This archive was generated by hypermail 2.1.8 : 2006-01-19 05:06:50 EST