Hi, On Sat, 24 Feb 2007, Sam Watkins wrote: > it should merge the changes as if I'd run git-pull on the remote box, > and handle conflicts in the same way. But that leaves conflicts in the working directory! You _have_ to resolve them (or reset) before proceding. > I don't understand git very well yet but that will work I think. I > thought "push" would be symmetrical to "pull" more or less, maybe it is > symmetrical to "fetch" ? Yes, that was the idea of the naming. > The app "arcs" we are writing, it is peer to peer, not necessarily using > a central repository, it commits pulls and pushes all changes made to > working copies automatically or when asked to. currently I'm > implementing push as a remote pull because of this problem, but that > can't connect back through firewalls and suchlike. Don't you have any user interaction? I.e. if the remote working directory is only ever changed by your hook, you can use what Junio sent. It is even overkill for that purpose. Hth, Dscho - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html