On Mon, 19 Aug 2013, Jeff Gonis wrote:

> Hi Levente and Chris,
> 
> Thank you for the replies.  Just as a final follow-up is this correct: Copying the merged mcz up to the remote server just sends the mcz as is to
> the server.  This means that there is a chance that my co-worker has uploaded another change to the server that is not taken into account by my
> merged mcz.  In this case I should merge those two mcz's and then save (or copy?) that to the server.  I occasionally see commit messages to the
> list saying "merged changes", and I am assuming that this is what has happened in this case?

Yes.

> 
> To summarize my question: If I am copying mcz's to the server, what is the correct way to deal with changes on the server that are more recent
> that the changes I am copying? Merge them on the server? Pull those changes down, merge on my own repository and then copy? Something else.

Merging always happens in your image. When you access a remote mcz from 
the Monticello Browser, the file is copied to your package cache. When you 
save something to a remote repository, a local copy will be added to your 
package cache.
So even if you're seemingly merging on the server, both the inputs and 
the output will be present on your machine too.

If you want to ensure that your changes are in the last version on the 
server, then the best is to check if there's a newer version before and 
after copying your changes to the server. But normally you just copy it, 
and someone (either you, or someone else) will merge it later. Or you save 
directly to the remote repository, and MC will notify you, if there's a 
newer version available on the server.


Levente

> 
> Thanks again for all your help. I think that nailing down this workflow for Monticello will really help me and perhaps I can contribute some
> documentation based on these emails.
> 
> Jeff
> 
>