merge vs. "update -m" and working with a remote repository

[Ramon Diaz-Uriarte]

Thanks to Thibault, Thomas, and Christian for their answers to my two
questions.  The "update -m" vs. "merge" is now perfectly clear to me,
and I see the options of what to do with a push; in particular, I like
Thomas's approach of not updating the working directory on the remote
since that is not really needed.

Best,

R.


-- 
Ramon Diaz-Uriarte
Bioinformatics Unit
Spanish National Cancer Centre (CNIO)
http://ligarto.org/rdiaz