From b4c889b1aa34bd4a13cd90edbaf82a0f07423f73 Mon Sep 17 00:00:00 2001
From: Partillay <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 21 Aug 2025 15:22:41 +0800
Subject: [PATCH 01/16] 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..e75b43b34
--- /dev/null
+++ b/progress.json
@@ -0,0 +1,38 @@
+[
+  {
+    "exercise_name": "grocery-shopping",
+    "started_at": 1755508364.21089,
+    "completed_at": 1755508364.983726,
+    "comments": [
+      "There are no new grocery list items added to the shopping list."
+    ],
+    "status": "Incomplete"
+  },
+  {
+    "exercise_name": "grocery-shopping",
+    "started_at": 1755508449.153344,
+    "completed_at": 1755508450.319568,
+    "comments": [
+      "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!"
+    ],
+    "status": "Completed"
+  },
+  {
+    "exercise_name": "staging-intervention",
+    "started_at": 1755508049.735304,
+    "completed_at": 1755508050.176954,
+    "comments": [
+      "Great work! You have successfully fixed the attendance system!"
+    ],
+    "status": "Completed"
+  },
+  {
+    "exercise_name": "under-control",
+    "started_at": 1755506381.551465,
+    "completed_at": 1755506381.891756,
+    "comments": [
+      "You successfully used git init to initialize this folder as a Git repository!"
+    ],
+    "status": "Completed"
+  }
+]
\ No newline at end of file

From 72f3b2a3186bfbcb2c16a9e68943a83067151c50 Mon Sep 17 00:00:00 2001
From: Partillay <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 21 Aug 2025 15:29:25 +0800
Subject: [PATCH 02/16] Update progress

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

diff --git a/progress.json b/progress.json
index e75b43b34..c8ff78b3c 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": 1755761190.595231,
+    "completed_at": 1755761364.366815,
+    "comments": [
+      "Great work setting up a public remote repository!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 3aeb9b4f9faa3873b949f6958b93835bc1f445d2 Mon Sep 17 00:00:00 2001
From: Partillay <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:14:17 +0800
Subject: [PATCH 03/16] Update progress

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

diff --git a/progress.json b/progress.json
index c8ff78b3c..7058d451b 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": 1755764055.834337,
+    "completed_at": 1755764056.270228,
+    "comments": [
+      "too many values to unpack (expected 2)"
+    ],
+    "status": "Error"
   }
 ]
\ No newline at end of file

From 249085832c6f3796ef9352d4cae86f289d25a3c2 Mon Sep 17 00:00:00 2001
From: Partillay <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:14:56 +0800
Subject: [PATCH 04/16] Update progress

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

diff --git a/progress.json b/progress.json
index 7058d451b..6172ab185 100644
--- a/progress.json
+++ b/progress.json
@@ -52,5 +52,14 @@
       "too many values to unpack (expected 2)"
     ],
     "status": "Error"
+  },
+  {
+    "exercise_name": "link-me",
+    "started_at": 1755764096.058126,
+    "completed_at": 1755764096.108463,
+    "comments": [
+      "too many values to unpack (expected 2)"
+    ],
+    "status": "Error"
   }
 ]
\ No newline at end of file

From 4cdd702d4acc6f9766aef0ec4f0fbf8d357b068d Mon Sep 17 00:00:00 2001
From: Partillay <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:25:56 +0800
Subject: [PATCH 05/16] Update progress

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

diff --git a/progress.json b/progress.json
index 6172ab185..2cc9a88ad 100644
--- a/progress.json
+++ b/progress.json
@@ -61,5 +61,14 @@
       "too many values to unpack (expected 2)"
     ],
     "status": "Error"
+  },
+  {
+    "exercise_name": "link-me",
+    "started_at": 1755764754.823555,
+    "completed_at": 1755764755.926399,
+    "comments": [
+      "Wrong 'upstream' remote URL"
+    ],
+    "status": "Incomplete"
   }
 ]
\ No newline at end of file

From eecc638380d9573eadd2a813768561990d88e269 Mon Sep 17 00:00:00 2001
From: Partillay <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 21 Aug 2025 17:11:31 +0800
Subject: [PATCH 06/16] Update progress

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

diff --git a/progress.json b/progress.json
index 2cc9a88ad..0f6a9149f 100644
--- a/progress.json
+++ b/progress.json
@@ -70,5 +70,14 @@
       "Wrong 'upstream' remote URL"
     ],
     "status": "Incomplete"
+  },
+  {
+    "exercise_name": "link-me",
+    "started_at": 1755767490.324765,
+    "completed_at": 1755767490.939361,
+    "comments": [
+      "Great work with using git remote to add an upstream remote!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From e73b77e0abe052c44a2d005ebb043cc1fd0df812 Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Mon, 25 Aug 2025 14:47:55 +0800
Subject: [PATCH 07/16] Update progress

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

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

From 13de2628a6b834bd8cdd5558fbb28ec142575388 Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:29:55 +0800
Subject: [PATCH 08/16] Update progress

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

diff --git a/progress.json b/progress.json
index 83c49fbd0..2ee95ec6f 100644
--- a/progress.json
+++ b/progress.json
@@ -88,5 +88,14 @@
       "Great work pushing changes to the remote!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "ignoring-somethings",
+    "started_at": 1756106983.825063,
+    "completed_at": 1756106994.60344,
+    "comments": [
+      "You are not ignoring runaway.txt. Find where the file is and fix that."
+    ],
+    "status": "Incomplete"
   }
 ]
\ No newline at end of file

From 5b961c8a1fe8f28b78198d61769ac8c08df84092 Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:33:48 +0800
Subject: [PATCH 09/16] Update progress

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

diff --git a/progress.json b/progress.json
index 2ee95ec6f..9b17c82ad 100644
--- a/progress.json
+++ b/progress.json
@@ -97,5 +97,14 @@
       "You are not ignoring runaway.txt. Find where the file is and fix that."
     ],
     "status": "Incomplete"
+  },
+  {
+    "exercise_name": "ignoring-somethings",
+    "started_at": 1756107219.039795,
+    "completed_at": 1756107227.576886,
+    "comments": [
+      "You are not ignoring runaway.txt. Find where the file is and fix that."
+    ],
+    "status": "Incomplete"
   }
 ]
\ No newline at end of file

From be1dea9011e9d3e9e2e712256fbe258207c764fa Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Mon, 25 Aug 2025 15:35:45 +0800
Subject: [PATCH 10/16] Update progress

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

diff --git a/progress.json b/progress.json
index 9b17c82ad..72f52381f 100644
--- a/progress.json
+++ b/progress.json
@@ -106,5 +106,14 @@
       "You are not ignoring runaway.txt. Find where the file is and fix that."
     ],
     "status": "Incomplete"
+  },
+  {
+    "exercise_name": "ignoring-somethings",
+    "started_at": 1756107336.126896,
+    "completed_at": 1756107344.454932,
+    "comments": [
+      "Great work using .gitignore!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 733a8f29a2558713c805bafd36bd5c2fd0f9cff8 Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Mon, 25 Aug 2025 18:12:06 +0800
Subject: [PATCH 11/16] Update progress

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

diff --git a/progress.json b/progress.json
index 72f52381f..30e3e338a 100644
--- a/progress.json
+++ b/progress.json
@@ -115,5 +115,14 @@
       "Great work using .gitignore!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "fork-repo",
+    "started_at": 1756116722.101865,
+    "completed_at": 1756116725.278267,
+    "comments": [
+      "Great work creating a fork with Github!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 3c886df79938ded3e5a1adf1aeaf0739b24a95fc Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Mon, 25 Aug 2025 18:20:48 +0800
Subject: [PATCH 12/16] Update progress

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

diff --git a/progress.json b/progress.json
index 30e3e338a..9bf5b2d5f 100644
--- a/progress.json
+++ b/progress.json
@@ -124,5 +124,14 @@
       "Great work creating a fork with Github!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "clone-repo",
+    "started_at": 1756117243.830503,
+    "completed_at": 1756117247.152871,
+    "comments": [
+      "Great work creating a clone of a fork from Github!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 9765ceadb426e62934eb5dc964a82b31ad0b8096 Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Mon, 25 Aug 2025 18:55:36 +0800
Subject: [PATCH 13/16] Update progress

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

diff --git a/progress.json b/progress.json
index 9bf5b2d5f..1a8a512bc 100644
--- a/progress.json
+++ b/progress.json
@@ -133,5 +133,14 @@
       "Great work creating a clone of a fork from Github!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "fetch-and-pull",
+    "started_at": 1756119334.297837,
+    "completed_at": 1756119335.467497,
+    "comments": [
+      "Great work fetching and pulling different upstreams!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 4b0cefba30b4fae83bcdcbbfd9f07f9f5e6f37ef Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 28 Aug 2025 14:14:26 +0800
Subject: [PATCH 14/16] Update progress

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

diff --git a/progress.json b/progress.json
index 1a8a512bc..9b46e5543 100644
--- a/progress.json
+++ b/progress.json
@@ -142,5 +142,14 @@
       "Great work fetching and pulling different upstreams!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "side-track",
+    "started_at": 1756361664.613269,
+    "completed_at": 1756361665.444508,
+    "comments": [
+      "Great work with using git branch and git checkout to fix the bugs!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file

From 9b5fc18549f90357ec7c627917f6df5cf56febd3 Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 28 Aug 2025 14:19:28 +0800
Subject: [PATCH 15/16] Update progress

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

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

From 6c5d28d6271616f852db622e726c4da68a259163 Mon Sep 17 00:00:00 2001
From: Partillay791 <226736716+Partillay791@users.noreply.github.com>
Date: Thu, 28 Aug 2025 14:30:29 +0800
Subject: [PATCH 16/16] Update progress

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

diff --git a/progress.json b/progress.json
index 8019f3592..d39d346d9 100644
--- a/progress.json
+++ b/progress.json
@@ -160,5 +160,14 @@
       "Great work with merging the branches in order! Try running the HTML files locally!"
     ],
     "status": "Completed"
+  },
+  {
+    "exercise_name": "conflict-mediator",
+    "started_at": 1756362628.553274,
+    "completed_at": 1756362629.223837,
+    "comments": [
+      "Great work resolving the merge conflict!"
+    ],
+    "status": "Completed"
   }
 ]
\ No newline at end of file