On 10/31/06, Dan Rossi <[EMAIL PROTECTED]> wrote:
"<<<" means local changes and ">>>" means changes on server.
hi i know this isnt appriate, but how is it possible to merge changes on files that i modify and then become conflicted as svn adds the <<< mine tags everywhere. let me know.
"<<<" means local changes and ">>>" means changes on server.
_______________________________________________
Red5 mailing list
[email protected]
http://osflash.org/mailman/listinfo/red5_osflash.org
--
I cannot tell why this heart languishes in silence. It is for small needs it never asks, or knows or remembers. -- Tagore
Best Regards
Steven Gong
_______________________________________________ Red5 mailing list [email protected] http://osflash.org/mailman/listinfo/red5_osflash.org
