rebase提交

Merge branch 'dev'
# Conflicts: # t.txt
2023-10-21 16:39:47 +08:00 · 2023-10-18 15:12:24 +08:00 · 2023-10-18 15:10:42 +08:00
2 changed files with 2 additions and 1 deletions
--- a/rebase.txt
+++ b/rebase.txt
@ -0,0 +1 @@
 rebase尝试
--- a/t.txt
+++ b/t.txt
@ -1,2 +1,2 @@
 test1 line 1
-dev 分支
+master 分支
Author	SHA1	Message	Date
zry	901d72f3c9	rebase提交	2023-10-21 16:39:47 +08:00
zry	716e611917	Merge branch 'dev' # Conflicts: # t.txt	2023-10-18 15:12:24 +08:00
zry	82abc893e1	master分支的修改	2023-10-18 15:10:42 +08:00