On 10/30/06, Dan Rossi <[EMAIL PROTECTED]
> wrote:
Steven Gong 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. :-)
No i meant i have to manually merge and fixup the files, as thats what i have to do at the moment, take out those added tags even, more specifically it thinks i made a change to the source when i have to add my apps to the jetty config so the entire bean setting for the apps in the jetty conf is within these tags.
_______________________________________________
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
