Remote merge conflict resolution with local GUI tools
I would like to use a GUI app on my Mac (Changes http://connectedflow.com/changes/) 开发者_C百科to resolve merge conflicts when using Mercurial via SSH on my server.
What is the most straightforward way to achieve this without cloning the repository locally?
If it were me, I would either:
- Clone the remote repository, merge locally, then push the merge
- Mount the remote repository, then merge locally (if you've got ssh access, you can use macfuse)
精彩评论