Re: [ANNOUNCE] Example Cogito Addon - cogito-bundle

Dear diary, on Fri, Oct 20, 2006 at 10:49:53PM CEST, I got a letter
where David Lang [off-list ref] said that...

On Fri, 20 Oct 2006, Petr Baudis wrote:

quoted

Dear diary, on Fri, Oct 20, 2006 at 07:48:58PM CEST, I got a letter
where Linus Torvalds [off-list ref] said that...

quoted

So yeah, I've seen a few strange cases myself, but they've actually been
interesting. Like seeing how much of a file was just a copyright license,
and then a file being considered a "copy" just because it didn't actually
introduce any real new code.

Well it's certainly "interesting" and fun to see, but is it equally fun
to handle mismerges caused by a broken detection?

I've talked to some people who really didn't mind (or even liked) Git's
heuristics when it came to _inspecting_ movement of content, but were
really nervous about merge following such heuristics.

remember, git only stores the results. so when you are merging it doesn't 
even look for renames.

Of course it does look for renames; when you use the recursive strategy,
it will try to merge across renames.