Rebase practice 1

Another rebase conflict commit
rebase practice on main 1
2026-03-16 17:49:11 +07:00 · 2026-03-16 17:46:37 +07:00 · 2026-03-16 17:46:18 +07:00 · 2026-03-16 14:49:33 +07:00 · 2026-03-16 14:39:01 +07:00 · 2026-03-13 20:37:34 +07:00
2 changed files with 8 additions and 2 deletions
@@ -1 +1,8 @@
 This will be a GIT local training repo.
 Good checkpoint
 Conflicting line main specific
 another conflicting line
 Practicing rebase functionality
@@ -1 +0,0 @@
 This is the first task of GIT.
Author	SHA1	Message	Date
hybrid_theory	5dee74b83b	Rebase practice 1	2026-03-16 17:49:11 +07:00
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
hybrid_theory	8c8d3c56f0	Good checkpoint	2026-03-16 14:49:33 +07:00
hybrid_theory	ad768bee11	Two tiny changes	2026-03-16 14:39:01 +07:00
hybrid_theory	9a899c86dc	Revert "Added another line" This reverts commit `a7bec0bbf4`.	2026-03-13 20:37:34 +07:00
hybrid_theory	e4baa37a33	Bad change	2026-03-13 20:29:41 +07:00
hybrid_theory	8f6329729c	Merge branch 'task-6'	2026-03-13 20:04:38 +07:00
hybrid_theory	a7bec0bbf4	Added another line	2026-03-13 20:02:56 +07:00
hybrid_theory	2341026ed0	Added a line to readme	2026-03-13 20:02:10 +07:00
hybrid_theory	065d385362	Delete task_1	2026-03-13 19:58:00 +07:00