From e2789f65d4a86fe5194ac65491f04144b3318f45 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 14:23:54 +0800
Subject: [PATCH 01/17] Sync progress with local machine

---
 progress.json | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 progress.json

diff --git a/progress.json b/progress.json
new file mode 100644
index 000000000..293953f08
--- /dev/null
+++ b/progress.json
@@ -0,0 +1,38 @@
+[
+  {
+    "exercise_name": "grocery-shopping",
+    "started_at": 1755447971.22366,
+    "completed_at": 1755447971.818823,
+    "comments": [
+      "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!"
+    ],
+    "status": "Completed"
+  },
+  {
+    "exercise_name": "stage-fright",
+    "started_at": 1755447065.190595,
+    "completed_at": 1755447065.733211,
+    "comments": [
+      "Great work! You have successfully checked in all the actors!"
+    ],
+    "status": "Completed"
+  },
+  {
+    "exercise_name": "staging-intervention",
+    "started_at": 1755447353.677615,
+    "completed_at": 1755447353.993799,
+    "comments": [
+      "Great work! You have successfully fixed the attendance system!"
+    ],
+    "status": "Completed"
+  },
+  {
+    "exercise_name": "under-control",
+    "started_at": 1755446198.712396,
+    "completed_at": 1755446199.076761,
+    "comments": [
+      "You successfully used git init to initialize this folder as a Git repository!"
+    ],
+    "status": "Completed"
+  }
+]
\ No newline at end of file

From 2f29c8ea0d5e2159643edb595a5d25cefe70bd26 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 14:28:53 +0800
Subject: [PATCH 02/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index 293953f08..bef78a61e 100644
--- a/progress.json
+++ b/progress.json
@@ -34,5 +34,14 @@
       "You successfully used git init to initialize this folder as a Git repository!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "remote-control",
+    "started_at": 1755844053.95012,
+    "completed_at": 1755844133.238342,
+    "comments": [
+      "Great work setting up a public remote repository!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From dba2619d86f85f98c37020413a87348c53d8f779 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 14:34:56 +0800
Subject: [PATCH 03/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index bef78a61e..f4948d768 100644
--- a/progress.json
+++ b/progress.json
@@ -43,5 +43,14 @@
       "Great work setting up a public remote repository!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "link-me",
+    "started_at": 1755844495.36249,
+    "completed_at": 1755844495.680735,
+    "comments": [
+      "Great work with using git remote to add an upstream remote!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From cca626992f2bd976aafe9efb03aabadbb28bff4f Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:23:02 +0800
Subject: [PATCH 04/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index f4948d768..b9df241a6 100644
--- a/progress.json
+++ b/progress.json
@@ -52,5 +52,14 @@
       "Great work with using git remote to add an upstream remote!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "push-over",
+    "started_at": 1755847380.63508,
+    "completed_at": 1755847381.713088,
+    "comments": [
+      "Great work pushing changes to the remote!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 77453e2106e869d267b32bc74038b5e6bf82a6a3 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:50:37 +0800
Subject: [PATCH 05/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index b9df241a6..bbb019909 100644
--- a/progress.json
+++ b/progress.json
@@ -61,5 +61,14 @@
       "Great work pushing changes to the remote!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "ignoring-somethings",
+    "started_at": 1755849035.719821,
+    "completed_at": 1755849036.63629,
+    "comments": [
+      "You should be using ** to match all subfolders to ignore runaway.txt."
+    ],
+    "status": "Incomplete"
   }
 ]
\ No newline at end of file

From 814a5636e6aa76bbb2293b1a214c649f6d4c58b0 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:54:50 +0800
Subject: [PATCH 06/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index bbb019909..982d9c9e6 100644
--- a/progress.json
+++ b/progress.json
@@ -70,5 +70,14 @@
       "You should be using ** to match all subfolders to ignore runaway.txt."
     ],
     "status": "Incomplete"
+  },
+  {
+    "exercise_name": "ignoring-somethings",
+    "started_at": 1755849288.601792,
+    "completed_at": 1755849289.451529,
+    "comments": [
+      "You should be using ** to match all subfolders to ignore runaway.txt."
+    ],
+    "status": "Incomplete"
   }
 ]
\ No newline at end of file

From a2834a02f67462c7b773013e753b12feec2ea724 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 15:56:10 +0800
Subject: [PATCH 07/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index 982d9c9e6..88e3d0776 100644
--- a/progress.json
+++ b/progress.json
@@ -79,5 +79,14 @@
       "You should be using ** to match all subfolders to ignore runaway.txt."
     ],
     "status": "Incomplete"
+  },
+  {
+    "exercise_name": "ignoring-somethings",
+    "started_at": 1755849369.23984,
+    "completed_at": 1755849370.091013,
+    "comments": [
+      "Great work using .gitignore!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From ac81b4915ae2a009967280a8c1944417de8356da Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 16:10:05 +0800
Subject: [PATCH 08/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index 88e3d0776..e9684472c 100644
--- a/progress.json
+++ b/progress.json
@@ -88,5 +88,14 @@
       "Great work using .gitignore!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "fork-repo",
+    "started_at": 1755850202.636223,
+    "completed_at": 1755850204.782288,
+    "comments": [
+      "Great work creating a fork with Github!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 5e071903a0252c22894d97103c72ad7b370e9cfb Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 16:24:34 +0800
Subject: [PATCH 09/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index e9684472c..ebdf04c35 100644
--- a/progress.json
+++ b/progress.json
@@ -97,5 +97,14 @@
       "Great work creating a fork with Github!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "clone-repo",
+    "started_at": 1755851071.698584,
+    "completed_at": 1755851074.000518,
+    "comments": [
+      "The upstream remote does not point to the original repository!"
+    ],
+    "status": "Incomplete"
   }
 ]
\ No newline at end of file

From a452c69ad76ffdbb2a4a5267c31e394a1009f10d Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 16:25:35 +0800
Subject: [PATCH 10/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index ebdf04c35..fc862a83c 100644
--- a/progress.json
+++ b/progress.json
@@ -106,5 +106,14 @@
       "The upstream remote does not point to the original repository!"
     ],
     "status": "Incomplete"
+  },
+  {
+    "exercise_name": "clone-repo",
+    "started_at": 1755851132.819975,
+    "completed_at": 1755851134.991251,
+    "comments": [
+      "Great work creating a clone of a fork from Github!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 0d3ad54d64990e9bfebaf02cbbd0fcd4316e280f Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 22 Aug 2025 17:15:34 +0800
Subject: [PATCH 11/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index fc862a83c..0d26e7cae 100644
--- a/progress.json
+++ b/progress.json
@@ -115,5 +115,14 @@
       "Great work creating a clone of a fork from Github!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "fetch-and-pull",
+    "started_at": 1755854133.747178,
+    "completed_at": 1755854134.309925,
+    "comments": [
+      "Great work fetching and pulling different upstreams!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 9d0cb533fba5143139b2c4ef3f5b7dd4109a28c7 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Thu, 28 Aug 2025 21:05:55 +0800
Subject: [PATCH 12/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index 0d26e7cae..6792e45b2 100644
--- a/progress.json
+++ b/progress.json
@@ -124,5 +124,14 @@
       "Great work fetching and pulling different upstreams!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "side-track",
+    "started_at": 1756386353.427277,
+    "completed_at": 1756386354.009519,
+    "comments": [
+      "Great work with using git branch and git checkout to fix the bugs!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 3ce4e9d84e300a13922533c4d074543234ca8b59 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Thu, 28 Aug 2025 21:27:43 +0800
Subject: [PATCH 13/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index 6792e45b2..4f2ff2a19 100644
--- a/progress.json
+++ b/progress.json
@@ -133,5 +133,14 @@
       "Great work with using git branch and git checkout to fix the bugs!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "branch-bender",
+    "started_at": 1756387661.982902,
+    "completed_at": 1756387662.530163,
+    "comments": [
+      "Great work with merging the branches in order! Try running the HTML files locally!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 1480d903a1b8017ac4370d13687ff2b1be260328 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 29 Aug 2025 11:28:50 +0800
Subject: [PATCH 14/17] Update progress

---
 progress.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/progress.json b/progress.json
index 4f2ff2a19..9c9bf0d4c 100644
--- a/progress.json
+++ b/progress.json
@@ -142,5 +142,15 @@
       "Great work with merging the branches in order! Try running the HTML files locally!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "conflict-mediator",
+    "started_at": 1756438129.373844,
+    "completed_at": 1756438129.910678,
+    "comments": [
+      "You should resolve the merge by setting the print to be 'Hello Everyone and World!'",
+      "Reset the repository using \"gitmastery progress reset\" and start again"
+    ],
+    "status": "Incomplete"
   }
 ]
\ No newline at end of file

From cfa6e0893b8b37e3acf727c4ffad06f0274b3646 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 29 Aug 2025 11:29:41 +0800
Subject: [PATCH 15/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index 9c9bf0d4c..b0f2a19a7 100644
--- a/progress.json
+++ b/progress.json
@@ -152,5 +152,14 @@
       "Reset the repository using \"gitmastery progress reset\" and start again"
     ],
     "status": "Incomplete"
+  },
+  {
+    "exercise_name": "conflict-mediator",
+    "started_at": 1756438179.349534,
+    "completed_at": 1756438179.993355,
+    "comments": [
+      "Great work resolving the merge conflict!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From d4e4da7097db9bdaa30797ff6d93343ac8b03907 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 29 Aug 2025 11:51:23 +0800
Subject: [PATCH 16/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index b0f2a19a7..f6da46614 100644
--- a/progress.json
+++ b/progress.json
@@ -161,5 +161,14 @@
       "Great work resolving the merge conflict!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "branch-rename",
+    "started_at": 1756439482.547549,
+    "completed_at": 1756439483.094618,
+    "comments": [
+      "Great work with renaming the branches on your local repository!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 67ebb18048be681337f1940ef092d940b8ff38d9 Mon Sep 17 00:00:00 2001
From: KieronOei <65146443+KieronOei@users.noreply.github.com>
Date: Fri, 29 Aug 2025 12:01:27 +0800
Subject: [PATCH 17/17] Update progress

---
 progress.json | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/progress.json b/progress.json
index f6da46614..37ffa0dd4 100644
--- a/progress.json
+++ b/progress.json
@@ -170,5 +170,14 @@
       "Great work with renaming the branches on your local repository!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "branch-delete",
+    "started_at": 1756440086.739385,
+    "completed_at": 1756440087.31593,
+    "comments": [
+      "Great job using git branch to delete both merged and unmerged branches!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file