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

Brian West brian at bkw.org
Sat Feb 7 01:10:31 MST 2004


> Otherwise everytime upstream changes the APPS= value you'll have to
> manually merge the change; if your additions are all on lines of
> their own cvs up will do the merge itself.
>
> -JimC

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

bkw



More information about the asterisk-dev mailing list