开发者

Remote merge conflict resolution with local GUI tools

开发者 https://www.devze.com 2023-01-02 15:14 出处:网络
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.

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)
0

精彩评论

暂无评论...
验证码 换一张
取 消

关注公众号