rebase conflict file from a branch

Makzy-creator · Jul 12, 2023 · 72cd400 · 72cd400
1 parent 4c3cf7a
commit 72cd400
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/rebase-conflict.txt b/rebase-conflict.txt
@@ -0,0 +1,5 @@
+rebase-conflict-text 1 edited locally
+rebase-conflict-text 2 edited locallly
+rebase-conflict-text three edited locally
+rebase-conflict-text 4 edited locally
+rebase-conflict-text five edited locally