Daniel, am I right that that just updates his local copy, then he has to commit again? Will he get a merge conflict when he checks it in? Bob
Daniel Leidert wrote: >Am Sonntag, den 13.05.2007, 16:21 +0200 schrieb Angel Herraez: > > >>Dear developers: >> >>I just accidentally comitted some update arising from a conflict between the >>copy at SF and the local one at my computer. >>It is labeled as 7683 >>I don't know how to cancel that at SF and bring the system back to 7682 >> >> > >svn merge -r HEAD:7682 . > >Regards, Daniel > > >------------------------------------------------------------------------- >This SF.net email is sponsored by DB2 Express >Download DB2 Express C - the FREE version of DB2 express and take >control of your XML. No limits. Just data. Click to get it now. >http://sourceforge.net/powerbar/db2/ >_______________________________________________ >Jmol-developers mailing list >[email protected] >https://lists.sourceforge.net/lists/listinfo/jmol-developers > > ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ Jmol-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/jmol-developers
