From: Fredrik Kuivinen Date: Mon, 07 Nov 2005 22:58:07 GMT Subject: Re: Comments on recursive merge.. Message-ID: <20051107225807.GA10937@c165.ib.student.liu.se> In-Reply-To: On Mon, Nov 07, 2005 at 08:48:06AM -0800, Linus Torvalds wrote: > > Guys, > > I just hit my first real rename conflict, and very timidly tried the > "recursive" strategy in the hopes that I wouldn't need to do things by > hand. > > It resolved things beautifully. Good job. I'm glad that it worked. > My only worry is that I don't read python, so I don't really know how it > does what it does, which makes me nervous. Can somebody (Fredrik?) add > some documentation about the merge strategy and how it works. I will write something up. > Considering that the stupid resolve strategy really requires you to know > how git works when rename conflicts happen (things left in unmerged state > are really quite hard to handle by hand unless you know exactly what > you're doing), I'd almost suggest making "recursive" the default. I'm a > bit nervous about it, but knowing how it works would probably put most of > that to rest. It would be great if the recursive strategy could get some more testing. I have tested it on a thousand commits or so in a few kernel repositories and haven't found any bugs, but it could be due to errors in the test setup, testing the wrong repositories or just being lucky. Some real-world testing would be great. - Fredrik