如何git合并给定提交的文件到当前结帐？

Question

这是testfile.txt在提交319e2d8和24bf013(current checkout)之间的区别。预计(TO-BE-DELETED)将被删除，但它仍然在当前的结账24bf013。如何git merge testfile.txt从319e2d8到当地的24bf013？

$ git diff 319e2d8:testfile.txt 24bf013:testfile.txt
diff --git a/319e2d8:testfile.txt b/24bf013:testfile.txt/appointments.html
index 66f029ed..86601816 100755
--- a/testfile.txt
+++ b/testfile.txt
@@ -55,7 +55,7 @@
 data line 1
 data line 2
 data line 3
-<h1>data line 4</h1>
+<h1>data line 4(TO-BE-DELETED)</h1>
 data line 5
 data line 6

Answer 1

它将319e2d8合并到本地，并且只提交testfile.txt。