diff --git a/dhy.txt b/dhy.txt
index e69de29..8108fd9 100644
--- a/dhy.txt
+++ b/dhy.txt
@@ -0,0 +1,3 @@
+git checkout dhy -- aaa.txt 强制合并dhy中的aaa.txt文件
+git diff dev dhy -- aaa.txt
+git branch里面有 master 没有dev 所以需要让本地dev和远程dev关联上：git branch --set-upstream-to=origin/dev dev 然后 再 git push
\ No newline at end of file