Re: Code review/discussion time again.

[David Kastrup]

Carl Sorensen <address@hidden> writes:

> And if you have the source tree in a git repository, then it's trivial to
> make branches, and checkout the appropriate branch.  That way you don't have
> to worry about overwrites (and if you do have overwrite problems, then you
> just reset the head).
>
> It's no problem at all, if you do it that way.

Hello merge conflict, my old friend, I've come to talk with you again...

If you have ever worked in a project with a central ChangeLog file, you
know the permanent hassle with switching branches when some changes
require entries in a central file.

-- 
David Kastrup