当前位置: 动力学知识库 > 问答 > 编程问答 >

version control - Discard remote changes in SmartGit/Hg

问题描述:

How can I discard remote changes in binary files when merging? There is only menu item to discard changes in local file. When I'm trying to "resolve" it tells it can't do that thing for binary file.


Sorry, I've mentioned "resolver" menu but it was "conflict solver". Log http://pastebin.com/xhGuc3du.

Although when I'm using "resolve" I see OK icon in the operations log (right bottom corner) but "conflict" label does not disappear. Log http://pastebin.com/DEDWQSht.

网友答案:

To discard remote changes, Local|Discard should be sufficient. To set your local content either to your own version before the conflict ('ours') or to the remote version ('theirs') use Local|Resolve and select the corresponding option there.

分享给朋友:
您可能感兴趣的文章:
随机阅读: