Am Sonntag, den 13.05.2007, 09:33 -0500 schrieb Bob Hanson:
[`svn merge -r HEAD:7682 .']
> Daniel, am I right that that just updates his local copy, then he has to
> commit again?
Yes. To update the repository directly, use
svn merge -r HEAD:7682 . \
https://jmol.svn.sourceforge.net/svnroot/jmol/trunk/Jmol
> Will he get a merge conflict when he checks it in?
Not in this case. This change should be safely "merge-able".
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
