From a89f692bc4f7d0fa1f2fbe2dc33a16cfa2f49db1 Mon Sep 17 00:00:00 2001 From: hejunjie Date: Tue, 24 Oct 2023 19:57:22 +0800 Subject: [PATCH 1/5] 111 --- 1.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 1.txt diff --git a/1.txt b/1.txt deleted file mode 100644 index 3822829..0000000 --- a/1.txt +++ /dev/null @@ -1,7 +0,0 @@ -<<<<<<< HEAD -branch1 -======= -陈帅666 -gwx99 -branch_g ->>>>>>> remotes/origin/main From 8e4b61d78801d70b4710643a60e5030d27fe3ba8 Mon Sep 17 00:00:00 2001 From: hejunjie Date: Tue, 24 Oct 2023 20:06:35 +0800 Subject: [PATCH 2/5] branch_hjj --- 1.txt.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt.txt b/1.txt.txt index 9d07aa0..38831e7 100644 --- a/1.txt.txt +++ b/1.txt.txt @@ -1 +1,2 @@ -111 \ No newline at end of file +111 +branch_hjj \ No newline at end of file From d54e88120b0ffb80501392fabb93cc1c8b4d43c7 Mon Sep 17 00:00:00 2001 From: gwx <2844905945@qq.com> Date: Sun, 29 Oct 2023 09:23:03 +0800 Subject: [PATCH 3/5] main --- 1.txt.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt.txt b/1.txt.txt index 38831e7..7c86278 100644 --- a/1.txt.txt +++ b/1.txt.txt @@ -1,2 +1,3 @@ 111 -branch_hjj \ No newline at end of file +branch_hjj +gwx_work \ No newline at end of file From 6ced7090ef56d4eaca50ab3b506cdeeda74d8d1f Mon Sep 17 00:00:00 2001 From: gwx <2844905945@qq.com> Date: Sun, 29 Oct 2023 09:29:21 +0800 Subject: [PATCH 4/5] pull_requstest_gwx --- 1.txt.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt.txt b/1.txt.txt index 7c86278..1964803 100644 --- a/1.txt.txt +++ b/1.txt.txt @@ -1,3 +1,4 @@ 111 branch_hjj -gwx_work \ No newline at end of file +gwx_work +pull_request_gwx \ No newline at end of file From 5474f40471f7bda030747540164c7b757d3fe65e Mon Sep 17 00:00:00 2001 From: YY <2312797829@qq.com> Date: Sat, 4 Nov 2023 09:10:33 +0800 Subject: [PATCH 5/5] yqy_conduct --- 1.txt.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.txt.txt b/1.txt.txt index 1964803..235f832 100644 --- a/1.txt.txt +++ b/1.txt.txt @@ -1,4 +1,5 @@ 111 branch_hjj gwx_work -pull_request_gwx \ No newline at end of file +pull_request_gwx +yqy_conduct \ No newline at end of file