自动合并2个git分支的脚本？

Question

我的 git 存储库有 2 个分支：master 和development。我想要一个能够自动合并从开发到主控的所有更改的脚本。

我使用 Jenkins：Git 插件克隆存储库，然后运行此脚本（“版本”变量是作业参数）：

# merge
git checkout -b develop origin/develop
git checkout master
git merge -Xtheirs --squash develop -m "v${version}"

# commit
git commit -m "v${version}"

# tag
git tag v${version} -m "v${version}"

# push
git push origin v${version}

我在测试存储库上尝试了它，但失败了：

git merge -X他们的开发
冲突（删除/修改）：在develop中删除test.txt并在HEAD中修改。 test.txt 的版本 HEAD 留在树中。
自动合并失败；修复冲突，然后提交结果。

如何自动解决此冲突？我希望脚本始终根据“开发”分支添加/修改/删除文件，因为无论如何都不会触及 master 。 。

Answer 1

-X thoses 合并策略仅适用于解决文件中存在冲突的块。这些选项的文档位于 git-merge 手册中page：

      ours
           This option forces conflicting hunks to be auto-resolved
           cleanly by favoring our version. Changes from the other tree
           that do not conflict with our side are reflected to the merge
           result.

           This should not be confused with the ours merge strategy, which
           does not even look at what the other tree contains at all. It
           discards everything the other tree did, declaring our history
           contains all that happened in it.

       theirs
           This is opposite of ours.

在这种情况下，一个分支删除了该文件，而另一个分支修改了该文件，这与进行不同修改的两个分支之间的简单冲突块是不同的情况。

Answer 2

5 岁了……但仍然相关。

这是我的解决方案：
我删除主分支并从我想要“合并”的分支创建一个新的主分支：

GIT_BRANCH_TO_MERGE_FROM=`git symbolic-ref HEAD | sed 's!refs\/heads\/!!'`
GIT_BRANCH_TO_MERGE_TO="master"

git checkout "${GIT_BRANCH_TO_MERGE_TO}"
git checkout "${GIT_BRANCH_TO_MERGE_FROM}"

# Delete TO branch
git branch -D "${GIT_BRANCH_TO_MERGE_TO}" || echo "Failed to delete ${GIT_BRANCH_TO_MERGE_TO}"
git push origin :"${GIT_BRANCH_TO_MERGE_TO}" || echo "Failed to push ${GIT_BRANCH_TO_MERGE_TO} delete to origin"

# Create TO branch
git checkout -b "${GIT_BRANCH_TO_MERGE_TO}" || echo "Failed to create local branch ${GIT_BRANCH_TO_MERGE_TO}"
git push origin "${GIT_BRANCH_TO_MERGE_TO}" || echo "Failed to push ${GIT_BRANCH_TO_MERGE_TO} to origin"