diff --git a/dhy.txt b/dhy.txt
index e69de29..4a06c26 100644
--- a/dhy.txt
+++ b/dhy.txt
@@ -0,0 +1,4 @@
+git checkout dhy -- aaa.txt 强制合并dhy中的aaa.txt文件
+git diff dev dhy -- aaa.txt
+git merge dhy --no-edit  不需要每次合并都编辑
+git branch里面有 master 没有dev 所以需要让本地dev和远程dev关联上：git branch --set-upstream-to=origin/dev dev 然后 再 git push
\ No newline at end of file
diff --git a/~$git学习文档 - 副本.doc b/~$git学习文档 - 副本.doc
new file mode 100644
index 0000000..fcd42e3
Binary files /dev/null and b/~$git学习文档 - 副本.doc differ
diff --git a/冷辉git学习文档 - 副本.doc b/冷辉git学习文档 - 副本.doc
new file mode 100644
index 0000000..e7f8b37
Binary files /dev/null and b/冷辉git学习文档 - 副本.doc differ
diff --git a/冷辉git学习文档.doc b/冷辉git学习文档.doc
deleted file mode 100644
index 5fad472..0000000
Binary files a/冷辉git学习文档.doc and /dev/null differ
diff --git a/赵文康Git学习文档.docx b/赵文康Git学习文档.docx
new file mode 100644
index 0000000..723db9c
Binary files /dev/null and b/赵文康Git学习文档.docx differ