Re: [Red5] merging modifications on files after svn updates

Mon, 30 Oct 2006 17:54:37 -0800

Steven Gong wrote:


On 10/31/06, Dan Rossi <[EMAIL PROTECTED]> wrote:
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.

Ok they have to be manually edited ?

_______________________________________________
Red5 mailing list
[email protected]
http://osflash.org/mailman/listinfo/red5_osflash.org

Reply via email to