How to hg unshelve without merge

Question

Is there a way I can force hg unshelve without causing any merge conflicts? Just overwrite the old files with the shelved state?

Answer 1

只需使用

hg unshelve --tool :other

使用内部合并工具:other将指示Mercurial始终将搁置版本更改为本地更改。有关各种内部合并工具的详细信息，请参阅hg help mergetools。