diff --git a/doc/Git实践笔记.txt b/doc/Git实践笔记.txt index 88a3ddb..71cdba4 100644 --- a/doc/Git实践笔记.txt +++ b/doc/Git实践笔记.txt @@ -1 +1 @@ -郑汐蕾_branch 分支:修改第一行内容,制造冲突 \ No newline at end of file +main 分支:修改第一行内容,制造冲突 \ No newline at end of file