告诉Git不要合并二进制文件,而是选择

您可以在 .gitattributes 文件(仅适用于给定子树,仅适用于某些文件类型)

见 this question 例如(或 this one )

# choose the name of the merge driver to be use for all jar files
echo *.jar merge=keepTheir > dirWithJarFiles\.gitattributes

在git repo的配置中声明合并驱动程序:

git config merge.keepTheir.name "always keep their during merge"
git config merge.keepTheir.driver "keepTheir.sh %O %A %B"

或

git config merge.keepMine.name "always keep mine during merge"
git config merge.keepMine.driver "keepMine.sh %O %A %B"
[merge "keepMine"]
        name = always keep mine during merge
        driver = keepMine.sh %O %A %B

我给出的示例不要求您选择,但在合并时始终保留“我的”(或“您的”)版本。
但是您可以调整这个合并驱动程序执行的脚本来问您一个问题,然后将您的选择应用于所有合并。