I believe that Dan is saying he has modified the server code (his copy) so that when he does an update he gets conflicts, this is normal behavior. This may also be the cause of some of the issues he is posting on other threads.
Dan,
If you want to modify the code you should make a copy of it and modify the copy, not the code you are checking out. You would then want to use a tool like WinMerge to update any differences from the Red5 codebase to your copy.
Paul
On 10/30/06, Steven Gong <[EMAIL PROTECTED]> wrote:
On 10/31/06, Dan Rossi < [EMAIL PROTECTED]> wrote: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 ?
I did it manually. :-)_______________________________________________
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
--
The early bird may get the worm, but the second mouse gets the cheese.
_______________________________________________ Red5 mailing list [email protected] http://osflash.org/mailman/listinfo/red5_osflash.org
