Another rebase conflict commit

rebase practice on main 1
2026-03-16 17:46:37 +07:00 · 2026-03-16 17:46:18 +07:00
1 changed files with 5 additions and 1 deletions
@@ -1,3 +1,7 @@
 This will be a GIT local training repo.

 Good checkpoint
+
+Conflicting line main specific
+
+another conflicting line
Author	SHA1	Message	Date
hybrid_theory	cf709d75ae	Another rebase conflict commit	2026-03-16 17:46:37 +07:00
hybrid_theory	5cb594ee16	rebase practice on main 1	2026-03-16 17:46:18 +07:00