我在一个项目中有一个变更日志。我想在此文件的gitattributes中使用merge=union
。有没有一种方法可以像Git Tools-Advanced Merging中那样,将ours
和theirs
的概念结合起来?我希望theirs
始终处于的顶端
开发分支:
* Added Feature in development branch
* Added Feature Y
* Added Feature X
主:
Version 1.0
===
* Added Feature Z
* Added Feature Y
* Added Feature X
我试图避免Added Feature in development branch
直到1.0之后才引入的情况,但更改日志会显示如下内容:
Version 1.0
===
* Added Feature Z
* Added Feature in development branch
* Added Feature Y
* Added Feature X
我希望它能显示出这样的东西:
* Added Feature in development branch
Version 1.0
===
* Added Feature Z
* Added Feature Y
* Added Feature X
Union merge没有控制哪些零件从哪里出来的旋钮。
你可以编写自己的合并驱动程序,它确实有这样一个控制旋钮。