[Asterisk-Dev] Re: NEWBIE: how to modify Dial application

[James H. Cloos Jr.]

>>>>> "Brian" == Brian West <brian at bkw.org> writes:

Brian> Depends. CVS will merge local changes with changes from CVS if
Brian> it can without conflicts.

Of course, but the point is that keeping additions on their own lines
where possible reduces -- perhaps even eliminates -- conflicts.

-JimC