cvs will merge differences, and any conflicting edits will be highlighted, so you can sort them out quite simply.
Oh, and ant is also your friend. :) View the original post : http://www.jboss.org/index.html?module=bb&op=viewtopic&p=3829240#3829240 Reply to the post : http://www.jboss.org/index.html?module=bb&op=posting&mode=reply&p=3829240 ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ JBoss-user mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/jboss-user
