Questions tagged «hg-merge»

4
如何正确关闭Mercurial中的功能分支?
我已经完成了功能分支feature-x。我想将结果合并回default分支并关闭feature-x,以便在的输出中摆脱它hg branches。 我想出了以下情况,但是有一些问题: $ hg up default $ hg merge feature-x $ hg ci -m merge $ hg up feature-x $ hg ci -m 'Closed branch feature-x' --close-branch 所以feature-x分支(changests 40- 41)是封闭的,但有一个新的头,关闭分支机构变更44,将在上市hg heads每次: $ hg log ... o 44 Closed branch feature-x | | @ 43 merge |/| | o 42 …
By using our site, you acknowledge that you have read and understand our Cookie Policy and Privacy Policy.
Licensed under cc by-sa 3.0 with attribution required.