From c2f998baac9bcc6e28f74504200868f62f1a7207 Mon Sep 17 00:00:00 2001
From: Vladimir Parfinenko <vladimir.parfinenko@gmail.com>
Date: Sat, 15 Oct 2022 10:12:03 +0700
Subject: [PATCH 1/3] Rebase on sorting

---
 sort.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/sort.py b/sort.py
index 5c0e3e9..698fb63 100644
--- a/sort.py
+++ b/sort.py
@@ -1,5 +1,6 @@
 arr = [40, 4, 20, 10, 30, 6, 10]
 
+<<<<<<< HEAD
 # selection sort:
 for i in range(len(arr) - 1):
     min = i
@@ -7,5 +8,18 @@
         if arr[j] < arr[min]:
             min = j
     arr[i], arr[min] = arr[min], arr[i]
+=======
+# insertion sort:
+for i in range(1, len(arr)):
+    a_i = arr[i]
+    j = i - 1
+    while j >= 0:
+        if arr[j] > a_i:
+            arr[j + 1] = arr[j]
+        else:
+            break
+        j -= 1
+    arr[j + 1] = a_i
+>>>>>>> 871826d (Use better sorting algorithm)
 
 print(arr)

From 73113f1205f2b5eee407a344a2c79a2a134b7767 Mon Sep 17 00:00:00 2001
From: Vladimir Parfinenko <vladimir.parfinenko@gmail.com>
Date: Sat, 15 Oct 2022 10:16:41 +0700
Subject: [PATCH 2/3] Make sorting more verbose

---
 sort.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sort.py b/sort.py
index 698fb63..1ed19f0 100644
--- a/sort.py
+++ b/sort.py
@@ -5,6 +5,7 @@
 for i in range(len(arr) - 1):
     min = i
     for j in range(i + 1, len(arr)):
+        print("comparing {} and {}".format(arr[j], arr[min]))
         if arr[j] < arr[min]:
             min = j
     arr[i], arr[min] = arr[min], arr[i]

From 819755dc171672d9810e72482a2650008a06880c Mon Sep 17 00:00:00 2001
From: Alexey-shishkin4 <alexisv.shishkin@gmail.com>
Date: Sun, 15 Oct 2023 13:15:04 +0700
Subject: [PATCH 3/3] normal merge sorting

---
 sort.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/sort.py b/sort.py
index 1ed19f0..3d7e173 100644
--- a/sort.py
+++ b/sort.py
@@ -1,15 +1,5 @@
 arr = [40, 4, 20, 10, 30, 6, 10]
 
-<<<<<<< HEAD
-# selection sort:
-for i in range(len(arr) - 1):
-    min = i
-    for j in range(i + 1, len(arr)):
-        print("comparing {} and {}".format(arr[j], arr[min]))
-        if arr[j] < arr[min]:
-            min = j
-    arr[i], arr[min] = arr[min], arr[i]
-=======
 # insertion sort:
 for i in range(1, len(arr)):
     a_i = arr[i]
@@ -21,6 +11,5 @@
             break
         j -= 1
     arr[j + 1] = a_i
->>>>>>> 871826d (Use better sorting algorithm)
 
 print(arr)