新的Git分支与另外2个差异

Question

我想用其他2个git分支的文件差异在GIT中创建一个分支。 我不希望整个回购副本，而只希望更改后的文件保持其余文件夹结构不变。 我该如何实现？

例如：

分支1：testbranch1

deployment/src/main/apiproxy/myorg/folder1/file1.txt
deployment/src/main/apiproxy/myorg/folder1/file2.txt
deployment/src/main/apiproxy/myorg/folder2/file1.txt
deployment/src/main/apiproxy/myorg/folder2/file2.txt

分支2：testbranch2

deployment/src/main/apiproxy/myorg/folder1/file1.txt -> File Changed
deployment/src/main/apiproxy/myorg/folder1/file2.txt
deployment/src/main/apiproxy/myorg/folder2/file1.txt
deployment/src/main/apiproxy/myorg/folder2/file2.txt -> File Changed

新分支应具有：

deployment/src/main/apiproxy/myorg/folder1/file1.txt
deployment/src/main/apiproxy/myorg/folder2/file2.txt

Answer 1

除了创建新的分支，您还可以为更改创建补丁。

git format-patch testbranch2 --stdout > mypatch.patch

稍后，如果您需要应用补丁，请执行以下操作。

git apply mypatch.patch