如何看待商品差异 [英] How to see a mercurial difference

问题描述

abort: push creates new remote heads!
(did you forget to merge? use push -f to force)

有没有办法查看我正在处理的差异?我很想做一个推-f，并且首先想看看我正在覆盖什么. 谢谢！

Is there a way to see which differences I'm handling? I'm tempted to do a push -f and first want to see what I'm overwriting. Thanks!

推荐答案

永远不要执行push -f :)它很可能会失败，但是仍然不要这样做.我了解到这很困难.

Don't execute push -f, ever :) It will most likely fail but still, don't do it. I learned that the hard way.

发生错误是因为某些人已经将某些内容推送到主存储库.您需要做的是pull更改，然后再进行推送.要查看您将获得什么，请运行hg in或hg incoming(in是传入的别名)，然后运行hg pull -u.请参阅页面以获得更多其他信息做.

The error happens because some has already pushed something to the master repository. What you need to do is pull changes before pushing them. To see what will you get, run hg in or hg incoming (in is an alias of incoming), and afterwards run hg pull -u. See this page for more information on what else you can do.

这篇关于如何看待商品差异的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！