[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Code review/discussion time again.

From: Carl Sorensen
Subject: Re: Code review/discussion time again.
Date: Sun, 22 Nov 2009 07:57:16 -0700

On 11/21/09 11:49 PM, "David Kastrup" <address@hidden> wrote:

> 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.

It's never caused me a problem, and I've worked with a lot of changes in the
.scm files.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]