Remote Merge

[Matthieu Moy]

John A Meinel <john at arbash-meinel.com> writes:

> The hard part is that both pull and merge are able to merge the changes
> into the working tree.
> Which is a fuzzy operation, and thus difficult to do from remote.

In the case of "push", it is not fuzzy. After the push, the remote
working tree should be exactly the same as the local one. The history
may differ. The difficult thing would be a "rmerge", doing the
symetrical operation of "merge".

It should even be relatively easy to do efficiently: you can get the
inventory of the remote tree, see which files differ from your local
inventory and upload only those ones.

-- 
Matthieu