Squashed commit of the following:

commit 568fe70041 Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2 # Conflicts: # a.txt
br1
1 changed files with 4 additions and 1 deletions
--- a/a.txt
+++ b/a.txt
@ -1,2 +1,5 @@
+<<<<<<< HEAD
+=======
 aaaa
-br1
+br2
+>>>>>>> br2
Author	SHA1	Message	Date
WYS	4a8b1b4a84	Squashed commit of the following: commit `568fe70041` Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2 # Conflicts: # a.txt	1 year ago
WYS	425671248a	br1	1 year ago
WYS	f98a0edb4d	Merge branch 'br1' # Conflicts: # a.txt	1 year ago
WYS	2b796044d7	Squashed commit of the following: commit `568fe70041` Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2	1 year ago
WYS	ef5af86171	br1	1 year ago