From e29b43abf31d33b42389e624312e553b52bbe507 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:06:32 +0800 Subject: [PATCH 01/30] Update progress --- progress.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..b3c4ca5bb --- /dev/null +++ b/progress.json @@ -0,0 +1,11 @@ +[ + { + "exercise_name": "under-control", + "started_at": 1768939589.626761, + "completed_at": 1768939591.432226, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" + } +] \ No newline at end of file From b62adb234ce26dcbaa7bb73334ed2eaf7066740f Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:06:55 +0800 Subject: [PATCH 02/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b3c4ca5bb..7f887168e 100644 --- a/progress.json +++ b/progress.json @@ -7,5 +7,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1768939612.752217, + "completed_at": 1768939614.473539, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 37640e119e63a827871d73fd9934d7db1a4ec60a Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:07:10 +0800 Subject: [PATCH 03/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7f887168e..5aaa1dd6a 100644 --- a/progress.json +++ b/progress.json @@ -16,5 +16,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1768939628.571921, + "completed_at": 1768939630.359841, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 149d9dc8d3cfe81318c656722e2a3921ff962e93 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:07:22 +0800 Subject: [PATCH 04/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5aaa1dd6a..508ce6c76 100644 --- a/progress.json +++ b/progress.json @@ -25,5 +25,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1768939640.808787, + "completed_at": 1768939642.266898, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 6243745c390ff22517beaa7b78640e3ac76f4d7f Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:07:55 +0800 Subject: [PATCH 05/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 508ce6c76..e50c867b9 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": "under-control", + "started_at": 1768939673.378055, + "completed_at": 1768939674.84019, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 8bbb2fdd1b43eff3b04e05b7ec93c560ab378447 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:09:46 +0800 Subject: [PATCH 06/30] Update progress --- progress.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/progress.json b/progress.json index e50c867b9..047235175 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,16 @@ "You successfully used git init to initialize this folder as a Git repository!" ], "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1768939782.836572, + "completed_at": 1768939786.065246, + "comments": [ + "Did not add bob.txt", + "Did not add alice.txt", + "Did not add joe.txt" + ], + "status": "Incomplete" } ] \ No newline at end of file From b95a6797c6206b7ca4b7c43fe9b3bca44b07bdc1 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:09:58 +0800 Subject: [PATCH 07/30] Update progress --- progress.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/progress.json b/progress.json index 047235175..68f44cfe5 100644 --- a/progress.json +++ b/progress.json @@ -54,5 +54,16 @@ "Did not add joe.txt" ], "status": "Incomplete" + }, + { + "exercise_name": "stage-fright", + "started_at": 1768939794.367229, + "completed_at": 1768939797.690525, + "comments": [ + "Did not add alice.txt", + "Did not add bob.txt", + "Did not add joe.txt" + ], + "status": "Incomplete" } ] \ No newline at end of file From 9f87089bee0fb0b0a0caa3522d3e9caa888f4dad Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:10:44 +0800 Subject: [PATCH 08/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 68f44cfe5..5c375ba86 100644 --- a/progress.json +++ b/progress.json @@ -65,5 +65,14 @@ "Did not add joe.txt" ], "status": "Incomplete" + }, + { + "exercise_name": "stage-fright", + "started_at": 1768939842.550047, + "completed_at": 1768939844.033135, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" } ] \ No newline at end of file From d7b804b962df7539c3d31697553b4f3a8abdc517 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:12:27 +0800 Subject: [PATCH 09/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5c375ba86..2faca524a 100644 --- a/progress.json +++ b/progress.json @@ -74,5 +74,14 @@ "Great work! You have successfully checked in all the actors!" ], "status": "Completed" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1768939943.628097, + "completed_at": 1768939946.931256, + "comments": [ + "There are no new grocery list items added to the shopping list." + ], + "status": "Incomplete" } ] \ No newline at end of file From 235398ef84c29b9f0cff6a3ed9d635d0d5cf2c25 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:13:26 +0800 Subject: [PATCH 10/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 2faca524a..d776e5f23 100644 --- a/progress.json +++ b/progress.json @@ -83,5 +83,14 @@ "There are no new grocery list items added to the shopping list." ], "status": "Incomplete" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1768940004.233914, + "completed_at": 1768940005.721684, + "comments": [ + "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!" + ], + "status": "Completed" } ] \ No newline at end of file From 0a60e65126957032f3c6bdfd9bfbbee33c00f98d Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:15:03 +0800 Subject: [PATCH 11/30] Update progress --- progress.json | 97 ++++++++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 44 deletions(-) diff --git a/progress.json b/progress.json index d776e5f23..7d5ec6e7b 100644 --- a/progress.json +++ b/progress.json @@ -1,4 +1,53 @@ [ + { + "exercise_name": "grocery-shopping", + "started_at": 1768939943.628097, + "completed_at": 1768939946.931256, + "comments": [ + "There are no new grocery list items added to the shopping list." + ], + "status": "Incomplete" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1768940004.233914, + "completed_at": 1768940005.721684, + "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": 1768939782.836572, + "completed_at": 1768939786.065246, + "comments": [ + "Did not add bob.txt", + "Did not add alice.txt", + "Did not add joe.txt" + ], + "status": "Incomplete" + }, + { + "exercise_name": "stage-fright", + "started_at": 1768939794.367229, + "completed_at": 1768939797.690525, + "comments": [ + "Did not add alice.txt", + "Did not add bob.txt", + "Did not add joe.txt" + ], + "status": "Incomplete" + }, + { + "exercise_name": "stage-fright", + "started_at": 1768939842.550047, + "completed_at": 1768939844.033135, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, { "exercise_name": "under-control", "started_at": 1768939589.626761, @@ -45,52 +94,12 @@ "status": "Completed" }, { - "exercise_name": "stage-fright", - "started_at": 1768939782.836572, - "completed_at": 1768939786.065246, - "comments": [ - "Did not add bob.txt", - "Did not add alice.txt", - "Did not add joe.txt" - ], - "status": "Incomplete" - }, - { - "exercise_name": "stage-fright", - "started_at": 1768939794.367229, - "completed_at": 1768939797.690525, - "comments": [ - "Did not add alice.txt", - "Did not add bob.txt", - "Did not add joe.txt" - ], - "status": "Incomplete" - }, - { - "exercise_name": "stage-fright", - "started_at": 1768939842.550047, - "completed_at": 1768939844.033135, - "comments": [ - "Great work! You have successfully checked in all the actors!" - ], - "status": "Completed" - }, - { - "exercise_name": "grocery-shopping", - "started_at": 1768939943.628097, - "completed_at": 1768939946.931256, + "exercise_name": "remote-control", + "started_at": 1768940088.856802, + "completed_at": 1768940102.045648, "comments": [ - "There are no new grocery list items added to the shopping list." + "That is not the right Github url!" ], "status": "Incomplete" - }, - { - "exercise_name": "grocery-shopping", - "started_at": 1768940004.233914, - "completed_at": 1768940005.721684, - "comments": [ - "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!" - ], - "status": "Completed" } ] \ No newline at end of file From 79a26a7a1fd0e332e48ca842d48bae5eafb70ef9 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:16:00 +0800 Subject: [PATCH 12/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7d5ec6e7b..16aa359a6 100644 --- a/progress.json +++ b/progress.json @@ -101,5 +101,14 @@ "That is not the right Github url!" ], "status": "Incomplete" + }, + { + "exercise_name": "remote-control", + "started_at": 1768940116.858516, + "completed_at": 1768940159.840839, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 93c2de6c5ff970386d7687bab9ea03627fb2b5cf Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:17:23 +0800 Subject: [PATCH 13/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 16aa359a6..4f1d74893 100644 --- a/progress.json +++ b/progress.json @@ -110,5 +110,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1768940240.094992, + "completed_at": 1768940243.22918, + "comments": [ + "Missing remote called 'upstream'." + ], + "status": "Incomplete" } ] \ No newline at end of file From 49eac2c92075993a055b1f7b65aa0cf15501df24 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:18:27 +0800 Subject: [PATCH 14/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4f1d74893..4a856da25 100644 --- a/progress.json +++ b/progress.json @@ -119,5 +119,14 @@ "Missing remote called 'upstream'." ], "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1768940303.59538, + "completed_at": 1768940306.816357, + "comments": [ + "Wrong 'upstream' remote URL" + ], + "status": "Incomplete" } ] \ No newline at end of file From be737e1e14e343760b7bbf0ceaeb9ea943aa4ed5 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:19:30 +0800 Subject: [PATCH 15/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4a856da25..965f23016 100644 --- a/progress.json +++ b/progress.json @@ -128,5 +128,14 @@ "Wrong 'upstream' remote URL" ], "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1768940366.867933, + "completed_at": 1768940369.994327, + "comments": [ + "Wrong 'upstream' remote URL" + ], + "status": "Incomplete" } ] \ No newline at end of file From 94c0946c526aa7f174df5d962cf76974bf115760 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:20:00 +0800 Subject: [PATCH 16/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 965f23016..8c4e1a343 100644 --- a/progress.json +++ b/progress.json @@ -137,5 +137,14 @@ "Wrong 'upstream' remote URL" ], "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1768940398.955206, + "completed_at": 1768940400.304718, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 661f599105b295cafbe7bde3dad0b9cd65026015 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:22:02 +0800 Subject: [PATCH 17/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8c4e1a343..b40e97673 100644 --- a/progress.json +++ b/progress.json @@ -146,5 +146,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1768940517.00715, + "completed_at": 1768940521.69699, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 7e78413e5ecee6d66e89b764df509a1d0564966d Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:23:23 +0800 Subject: [PATCH 18/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b40e97673..71d6b980f 100644 --- a/progress.json +++ b/progress.json @@ -155,5 +155,14 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1768940600.436127, + "completed_at": 1768940603.317261, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From a838adf309afef47c6dca6b13131432ff4c5d8ac Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:26:26 +0800 Subject: [PATCH 19/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 71d6b980f..059b84910 100644 --- a/progress.json +++ b/progress.json @@ -164,5 +164,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1768940783.371581, + "completed_at": 1768940786.476569, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 7d7160a44736b88a9dae7460a0b3c291a758801d Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:29:43 +0800 Subject: [PATCH 20/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 059b84910..1c136dcdd 100644 --- a/progress.json +++ b/progress.json @@ -173,5 +173,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1768940981.077264, + "completed_at": 1768940982.5666, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" } ] \ No newline at end of file From 0c8fbc160caedc8854cbe7af82e3475a42f01f98 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:31:50 +0800 Subject: [PATCH 21/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1c136dcdd..0bd48398e 100644 --- a/progress.json +++ b/progress.json @@ -182,5 +182,14 @@ "Great work in viewing and understanding the diff of a specific commit!" ], "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1768941108.081602, + "completed_at": 1768941109.559438, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" } ] \ No newline at end of file From f1008f23824ccc83115c5f0b46f4e9335dbb2a4d Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:34:07 +0800 Subject: [PATCH 22/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0bd48398e..90c7a4d1f 100644 --- a/progress.json +++ b/progress.json @@ -191,5 +191,14 @@ "Great work using git tag to annotate various commits in the repository!" ], "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1768941245.392359, + "completed_at": 1768941246.764651, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" } ] \ No newline at end of file From 0c1d279c6299aa045e67148e16411c39840d40af Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:37:56 +0800 Subject: [PATCH 23/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 90c7a4d1f..ce3c23f10 100644 --- a/progress.json +++ b/progress.json @@ -200,5 +200,14 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1768941471.090062, + "completed_at": 1768941476.321237, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" } ] \ No newline at end of file From 870ee80df8de27f956702aea3062a32a2f4743c9 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:42:51 +0800 Subject: [PATCH 24/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ce3c23f10..8885c428d 100644 --- a/progress.json +++ b/progress.json @@ -209,5 +209,14 @@ "Wonderful! You have successfully synced the local tags with the remote tags!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1768941767.260567, + "completed_at": 1768941770.692279, + "comments": [ + "Answer for Which files have changed from Jan 09th to Jan 15th? does not contain all of the right answers." + ], + "status": "Incomplete" } ] \ No newline at end of file From d311a4b1f8513846296ef5ee70b7eb13be222cd5 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Wed, 21 Jan 2026 04:43:32 +0800 Subject: [PATCH 25/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8885c428d..ef0e6d406 100644 --- a/progress.json +++ b/progress.json @@ -218,5 +218,14 @@ "Answer for Which files have changed from Jan 09th to Jan 15th? does not contain all of the right answers." ], "status": "Incomplete" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1768941810.394697, + "completed_at": 1768941811.855901, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" } ] \ No newline at end of file From 4939e951fce6c5bffb0d6f18bd36cde97bd9b908 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Sat, 24 Jan 2026 21:51:16 +0800 Subject: [PATCH 26/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ef0e6d406..06c5082ff 100644 --- a/progress.json +++ b/progress.json @@ -227,5 +227,14 @@ "Great work comparing commits in git history!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1769262674.701142, + "completed_at": 1769262676.184057, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From a0dc5d6e527ac4e4523b64fdd3f93c05cac0f905 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Sat, 24 Jan 2026 21:54:13 +0800 Subject: [PATCH 27/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 06c5082ff..1d007f642 100644 --- a/progress.json +++ b/progress.json @@ -236,5 +236,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1769262851.128171, + "completed_at": 1769262852.612844, + "comments": [ + "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" + ], + "status": "Completed" } ] \ No newline at end of file From 439a64abf048f02d128b857589ee991c170107f1 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Sat, 24 Jan 2026 21:56:57 +0800 Subject: [PATCH 28/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1d007f642..15632b73f 100644 --- a/progress.json +++ b/progress.json @@ -245,5 +245,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1769263015.901008, + "completed_at": 1769263017.269514, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From fea72e5eef437caa35919009f85db29c7c529f77 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Sat, 24 Jan 2026 21:58:35 +0800 Subject: [PATCH 29/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 15632b73f..27718afe3 100644 --- a/progress.json +++ b/progress.json @@ -254,5 +254,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1769263113.682692, + "completed_at": 1769263115.160581, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From 29d1759e6957a2bab76c22fb5084c4467833f9c2 Mon Sep 17 00:00:00 2001 From: Zhang Li Kevin Date: Sat, 24 Jan 2026 22:00:44 +0800 Subject: [PATCH 30/30] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 27718afe3..9a1473b9a 100644 --- a/progress.json +++ b/progress.json @@ -263,5 +263,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1769263242.390719, + "completed_at": 1769263243.861827, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file