解决test.txt文件冲突

master分支重新修改test.txt
feature-branch 分支修改 test.txt
2 changed files with 4 additions and 3 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +0,0 @@
 # hanruiting_git_practice
--- a/test.txt
+++ b/test.txt
@ -1 +1,4 @@
-这是用于测试 Git 操作的文件
+
 这是用于测试 Git 操作的文件功能分支修改主分支修改
 feature-branch 分支修改
Author	SHA1	Message	Date
韩瑞婷	d75e5d9f68	解决test.txt文件冲突	3 months ago
韩瑞婷	822ea3f009	master分支重新修改test.txt	3 months ago
韩瑞婷	5a4ac6be80	feature-branch 分支修改 test.txt	3 months ago