我有一个分支（“other”）作为子树附加到另一个分支（“master”）。当我从“other”合并到“master”时，它不会删除在“other”中已删除的文件。
在干净的存储库上重现步骤：
这段文本的意思是：“所以，在合并已删除的文件后，就没有什么可提交的了。这是正确的行为吗？如何合并已删除的文件？”
在干净的存储库上重现步骤：
$ 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
这段文本的意思是：“所以，在合并已删除的文件后，就没有什么可提交的了。这是正确的行为吗？如何合并已删除的文件？”