I wrote:
> Avy wrote:
> > Would it be too strange to allow both clientside and serverside merges?
>
> No, but you're not thinking about it right.  Forget client side vs server
> side for a moment...what you are merging are two branches in your semantic
> model...whether it happens on the client or server makes no difference
> except as it relates to performance and complexity of the communications
> protocol (and maybe security, but completely forget that issue for now).
> The question is, do I want to move all of my code objects to the client to
> perform the merge or not.  If your clients are all working from a shared
> directory (with no server squeak process) then clearly, the only place you
> can do a merge is on the client.
>
> - Stephen

Just a follow up to this...if you design the merge operation (in whatever
form that takes) to work on your semantic model, then it should make no
difference to you whether you are merging two package versions stored in the
repository, or you are merging one package version stored in the repository
and one that is only in the client image and has never made it into the
repository (the case when you are wanting to avoid creating a branch in the
repository).

- Stephen