在 Mercurial 中恢复合并
我进行了合并，但后来我把它塞满了，所以我决定恢复回来。我曾多次尝试恢复到我合并的修订之一，但这不起作用。它不会抛出任何错误，只是我当前的存储库状态仍然显示为有两个头。我还尝试删除还原自动创建的所有备份文件。如何将其中一个磁头上的存储库恢复到干净状态？
I did a merge, but then I stuffed it up, so I decided to revert back. I have tried to revert to one of the revisions I merged several times, but this doesn't work. It doesn't throw any errors, it is just that my current repository state is still shown as having two heads. I also tried deleting all of the backup files that reversion automatically creates. How can I restore my repository to a clean state on one of the heads?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
尝试
hg update -C到其中一个头或任何修订版。为了避免这种情况，您可以只提交不需要的合并，然后稍后将其删除，而不是恢复。
Try
hg update -Cto one of the heads, or any revision.To avoid the situation, instead of reverting you can just commit the unwanted merge, then strip it later.