Question

我有一个分支（＆＃39;其他＆＃39;）作为子树附加到另一个分支（＆＃39; master＆＃39;）。当我从其他＆＃39;执行子树合并时到＃＆＃39;掌握＆＃39;它不会删除在其他＆＃39;

中删除的文件。

在干净的仓库上重现的步骤：

$ touch master.txt
$ git add master.txt
$ git commit -m 'Initial master'
[master (root-commit) e2f5ffd] Initial master
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 master.txt
$ git checkout --orphan other
Switched to a new branch 'other'
$ touch other.txt
$ git add other.txt
$ git status
On branch other

Initial commit

Changes to be committed:
  (use "git rm --cached <file>..." to unstage)

        new file:   master.txt
        new file:   other.txt
$ git commit -m 'Initial other'
[other (root-commit) 408ee95] Initial other
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 master.txt
 create mode 100644 other.txt
$ git checkout master
Switched to branch 'master'
$ git read-tree --prefix=other/ -u other
$ git status
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        new file:   other/master.txt
        new file:   other/other.txt
$ git commit -m 'Other subtreed'
[master f9ba0db] Other subtreed
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 other/master.txt
 create mode 100644 other/other.txt
$ git checkout other
Switched to branch 'other'
$ git rm master.txt
rm 'master.txt'
$ git commit -m 'master.txt removed'
[other 1feef18] master.txt removed
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 master.txt
$ git checkout master
Switched to branch 'master'
$ git merge --squash -s subtree --no-commit other
Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
$ git status
On branch master
nothing to commit, working directory clean

所以删除文件合并后 - 没有什么可以提交的。这是正确的行为吗？以及如何与已删除的文件合并？

Answer 1

合并子树以合并所有内容的正确方法是：

git merge -s recursive -Xsubtree=other --no-commit other

所以，它没有--squash，并且有一些不同的形式（来自git v2）。

为什么git子树合并不会删除文件？

1 个答案: