diff --git a/doc/Git实践笔记.txt b/doc/Git实践笔记.txt
index 8eca823..88a3ddb 100644
--- a/doc/Git实践笔记.txt
+++ b/doc/Git实践笔记.txt
@@ -1 +1 @@
-远程仓库编辑：测试拉取功能
\ No newline at end of file
+郑汐蕾_branch 分支：修改第一行内容，制造冲突
\ No newline at end of file