On Mon, May 19, 2008 at 09:58:55AM -0500, Manoj Srivastava wrote: > On Mon, 19 May 2008 10:42:54 +0200, Goswin von Brederlow > <[EMAIL PROTECTED]> said: > > Hmm. You say things like this: > > Because the git format is imho conceptualy broken and the > > implementation is far from completely thought out. > > And then you go saying things like that: > > It is trivial to generate a quilt format package from git/arch/hg/svn > > and I'm sure there will be a RCS-build-package soon enough that does > > that. > > This can not happen without manual intervention, if the topic > branches have overlap. And Redoing the manual conflict resolution over > and over and over again is a burden (the manual conflict resolution > lives generally in the integration branch history, and can be done > once, and mostly ignored from that point on). (...)
git has git rerere to deal with this. Mike -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
