From abc1792a8024699ea8cceed2c3bc672a00b6e79e Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 01:04:18 +0800 Subject: [PATCH 01/33] Sync progress with local machine --- progress.json | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..bf881ed04 --- /dev/null +++ b/progress.json @@ -0,0 +1,97 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1768148139.606829, + "completed_at": 1768148141.249442, + "comments": [ + "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!" + ], + "status": "Completed" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1768232915.074131, + "completed_at": 1768232916.696762, + "comments": [ + "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!" + ], + "status": "Completed" + }, + { + "exercise_name": "log-and-order", + "started_at": 1768148882.396176, + "completed_at": 1768148883.864151, + "comments": [], + "status": "Completed" + }, + { + "exercise_name": "log-and-order", + "started_at": 1768233324.173173, + "completed_at": 1768233325.695737, + "comments": [], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1768144948.942674, + "completed_at": 1768144950.361805, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1768232859.645182, + "completed_at": 1768232861.122934, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "staging-intervention", + "started_at": 1768146146.914439, + "completed_at": 1768146148.309574, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1768137695.544057, + "completed_at": 1768137700.562915, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1768231797.994432, + "completed_at": 1768231802.062591, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "undo-init", + "started_at": 1768138023.426642, + "completed_at": 1768138024.824431, + "comments": [ + "You have successfully undone the init operation!" + ], + "status": "Completed" + }, + { + "exercise_name": "undo-init", + "started_at": 1768231820.969589, + "completed_at": 1768231822.406775, + "comments": [ + "You have successfully undone the init operation!" + ], + "status": "Completed" + } +] \ No newline at end of file From 72a07c4b267789e6fd9669ef1babb7ef977555a0 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 01:11:42 +0800 Subject: [PATCH 02/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index bf881ed04..5f5fd4e84 100644 --- a/progress.json +++ b/progress.json @@ -93,5 +93,14 @@ "You have successfully undone the init operation!" ], "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1768237778.371571, + "completed_at": 1768237901.285486, + "comments": [ + "The remote repository url you provided either does not exist or is private. Try again!" + ], + "status": "Incomplete" } ] \ No newline at end of file From a341b4a729349a99aa139e84226a09a00f3bbd6d Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 01:13:09 +0800 Subject: [PATCH 03/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5f5fd4e84..0abecda42 100644 --- a/progress.json +++ b/progress.json @@ -102,5 +102,14 @@ "The remote repository url you provided either does not exist or is private. Try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "remote-control", + "started_at": 1768237979.656776, + "completed_at": 1768237988.632212, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 40788a26af6b520d8a6b8a877cde9e3b3026bf06 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 01:27:37 +0800 Subject: [PATCH 04/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0abecda42..7e97ae368 100644 --- a/progress.json +++ b/progress.json @@ -111,5 +111,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1768238854.883514, + "completed_at": 1768238856.235777, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 8026f40ae1969d9f046083448b93351150bd4db7 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 01:48:14 +0800 Subject: [PATCH 05/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7e97ae368..f85561c80 100644 --- a/progress.json +++ b/progress.json @@ -120,5 +120,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1768240092.119632, + "completed_at": 1768240094.125965, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From f80f84d7a751eb85c3d0088cf4b5d65a1eb1b083 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 01:56:21 +0800 Subject: [PATCH 06/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f85561c80..a35db3767 100644 --- a/progress.json +++ b/progress.json @@ -129,5 +129,14 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1768240577.62885, + "completed_at": 1768240580.481771, + "comments": [ + "You have not made any commits yet!" + ], + "status": "Incomplete" } ] \ No newline at end of file From f1e843d89cd255cc67cff512bdcf604bbcc2aaf0 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 01:57:03 +0800 Subject: [PATCH 07/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a35db3767..a22bca2fd 100644 --- a/progress.json +++ b/progress.json @@ -138,5 +138,14 @@ "You have not made any commits yet!" ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1768240618.536572, + "completed_at": 1768240622.241653, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" } ] \ No newline at end of file From aabafe52b56e6bd2527041e9a037bc74814991f5 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 02:00:56 +0800 Subject: [PATCH 08/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a22bca2fd..9980bbb20 100644 --- a/progress.json +++ b/progress.json @@ -147,5 +147,14 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1768240852.757416, + "completed_at": 1768240855.684861, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 9a34bb71d5da4e2b7029d491ddf1105257a6eda4 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 02:16:34 +0800 Subject: [PATCH 09/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9980bbb20..ad659c765 100644 --- a/progress.json +++ b/progress.json @@ -156,5 +156,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1768241791.407835, + "completed_at": 1768241794.239422, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 18ad7fbcc49e432402e4474ac635c444b4a91153 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 02:33:54 +0800 Subject: [PATCH 10/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ad659c765..99877831f 100644 --- a/progress.json +++ b/progress.json @@ -165,5 +165,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1768242832.6391, + "completed_at": 1768242834.164162, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From b0f18d35016276ee34267ff38e5294641701ef41 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 16:47:07 +0800 Subject: [PATCH 11/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 99877831f..5e634c2fd 100644 --- a/progress.json +++ b/progress.json @@ -174,5 +174,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1768294025.348026, + "completed_at": 1768294026.778391, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" } ] \ No newline at end of file From df46b57e8d575285a5f36ffcfd3317d926b159b3 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 18:07:33 +0800 Subject: [PATCH 12/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5e634c2fd..159e1b0af 100644 --- a/progress.json +++ b/progress.json @@ -183,5 +183,14 @@ "Great work in viewing and understanding the diff of a specific commit!" ], "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1768298851.072427, + "completed_at": 1768298852.608743, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 890f556f255788126a1ffcd7c13d0713a1076018 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 18:14:49 +0800 Subject: [PATCH 13/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 159e1b0af..c8529c9e6 100644 --- a/progress.json +++ b/progress.json @@ -192,5 +192,14 @@ "Great work using git tag to annotate various commits in the repository!" ], "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1768299287.772564, + "completed_at": 1768299289.227692, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" } ] \ No newline at end of file From 4be6683e0d818f1b643ea3dc4d55a3ad091aba0c Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 20:56:07 +0800 Subject: [PATCH 14/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c8529c9e6..f24496028 100644 --- a/progress.json +++ b/progress.json @@ -201,5 +201,14 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1768308965.676702, + "completed_at": 1768308967.148968, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" } ] \ No newline at end of file From 09522ec986248019a9b884db92fc138137aff5f6 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 21:19:59 +0800 Subject: [PATCH 15/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f24496028..20fbcd910 100644 --- a/progress.json +++ b/progress.json @@ -210,5 +210,14 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1768310396.348636, + "completed_at": 1768310398.740312, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" } ] \ No newline at end of file From d68030009582ecc41dcf6cf5e90f9ef65d843daa Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 22:25:31 +0800 Subject: [PATCH 16/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 20fbcd910..cb1dc0d7f 100644 --- a/progress.json +++ b/progress.json @@ -219,5 +219,14 @@ "Wonderful! You have successfully synced the local tags with the remote tags!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1768314327.511676, + "completed_at": 1768314331.213753, + "comments": [ + "Answer for Which new values are new in north.csv on Jan 10th, compared to Jan 01st? is not right." + ], + "status": "Incomplete" } ] \ No newline at end of file From d351f1d5bc81325350b15bc398b90e50a9fad766 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 22:26:18 +0800 Subject: [PATCH 17/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index cb1dc0d7f..c9b490c81 100644 --- a/progress.json +++ b/progress.json @@ -228,5 +228,14 @@ "Answer for Which new values are new in north.csv on Jan 10th, compared to Jan 01st? is not right." ], "status": "Incomplete" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1768314375.014865, + "completed_at": 1768314377.894556, + "comments": [ + "Answer for Which new values are new in north.csv on Jan 10th, compared to Jan 01st? is not right." + ], + "status": "Incomplete" } ] \ No newline at end of file From 43b5eb96bd1955cab94a15663d1fb510106d4476 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 22:26:42 +0800 Subject: [PATCH 18/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c9b490c81..6715d9279 100644 --- a/progress.json +++ b/progress.json @@ -237,5 +237,14 @@ "Answer for Which new values are new in north.csv on Jan 10th, compared to Jan 01st? is not right." ], "status": "Incomplete" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1768314399.983304, + "completed_at": 1768314401.39004, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" } ] \ No newline at end of file From 8d7ff4686643adfdfced43566a84501014aef3b6 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Tue, 13 Jan 2026 23:00:32 +0800 Subject: [PATCH 19/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6715d9279..b5097599b 100644 --- a/progress.json +++ b/progress.json @@ -246,5 +246,14 @@ "Great work comparing commits in git history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-checkout", + "started_at": 1768316430.099775, + "completed_at": 1768316431.596835, + "comments": [ + "Great work traversing the revision history!" + ], + "status": "Completed" } ] \ No newline at end of file From 522c25b85e3b33c225115d8a0fc482c601c06a18 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 00:05:25 +0800 Subject: [PATCH 20/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b5097599b..d2ff4b30c 100644 --- a/progress.json +++ b/progress.json @@ -255,5 +255,14 @@ "Great work traversing the revision history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1768320323.52543, + "completed_at": 1768320325.063869, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" } ] \ No newline at end of file From 408336999e2266b47fcb40d1b00716b43bef6aa2 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 00:23:43 +0800 Subject: [PATCH 21/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d2ff4b30c..1cfda572a 100644 --- a/progress.json +++ b/progress.json @@ -264,5 +264,14 @@ "You have reset the repository to the correct state!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1768321421.256, + "completed_at": 1768321422.733045, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" } ] \ No newline at end of file From 27a5ed625a263d003a80443952266dbbbcab4c19 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 06:11:02 +0800 Subject: [PATCH 22/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1cfda572a..f131c51bf 100644 --- a/progress.json +++ b/progress.json @@ -273,5 +273,14 @@ "Good work reverting commits!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1768342259.236958, + "completed_at": 1768342262.168269, + "comments": [ + "You aren't currently on the main branch. Checkout to that branch and try again!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 1dbb08ff3e3e20bcb6cd015d41028312a8c1fbd7 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 06:11:20 +0800 Subject: [PATCH 23/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f131c51bf..a613ac338 100644 --- a/progress.json +++ b/progress.json @@ -282,5 +282,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1768342278.868002, + "completed_at": 1768342280.387206, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 235fd32c660d361b8a858fe47378a5b80a4cac5f Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 06:20:15 +0800 Subject: [PATCH 24/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a613ac338..651c74d87 100644 --- a/progress.json +++ b/progress.json @@ -291,5 +291,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1768342813.214194, + "completed_at": 1768342814.690822, + "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 145b4c9ec1fda10940897a3f1be3fa1fb40023a7 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 23:08:06 +0800 Subject: [PATCH 25/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 651c74d87..bc477d2e0 100644 --- a/progress.json +++ b/progress.json @@ -300,5 +300,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1768403284.350946, + "completed_at": 1768403285.825558, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 5851e9196ba16d7fd10164d777eae473e76bdca7 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 23:29:16 +0800 Subject: [PATCH 26/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index bc477d2e0..525fed4f2 100644 --- a/progress.json +++ b/progress.json @@ -309,5 +309,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1768404554.567551, + "completed_at": 1768404556.017733, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From 6123c66a55247ca29ecc3a54bfc9b39bb9be8565 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 23:33:45 +0800 Subject: [PATCH 27/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 525fed4f2..c7e90608f 100644 --- a/progress.json +++ b/progress.json @@ -318,5 +318,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1768404823.775325, + "completed_at": 1768404825.215966, + "comments": [ + "Great work with undoing the merges! Try listing the directory to see what has changed." + ], + "status": "Completed" } ] \ No newline at end of file From 55e0f18530e7f31a00e59deac2921acde4335627 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Wed, 14 Jan 2026 23:39:07 +0800 Subject: [PATCH 28/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c7e90608f..db9e69dbf 100644 --- a/progress.json +++ b/progress.json @@ -327,5 +327,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1768405144.699606, + "completed_at": 1768405146.136538, + "comments": [ + "You have successfully undone the merge of branch 'others'." + ], + "status": "Completed" } ] \ No newline at end of file From f0468200ba89b0c4614006499e74e00f2752245c Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Thu, 15 Jan 2026 11:24:59 +0800 Subject: [PATCH 29/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index db9e69dbf..3f634d3c2 100644 --- a/progress.json +++ b/progress.json @@ -336,5 +336,14 @@ "You have successfully undone the merge of branch 'others'." ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1768447495.23672, + "completed_at": 1768447498.330284, + "comments": [ + "Answer for Which numbers are present in stream-1 but not in stream-2? is not right." + ], + "status": "Incomplete" } ] \ No newline at end of file From e475c6632e4f8d4328d6f2fd49d3034c2513e165 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Thu, 15 Jan 2026 11:25:39 +0800 Subject: [PATCH 30/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3f634d3c2..9973ba761 100644 --- a/progress.json +++ b/progress.json @@ -345,5 +345,14 @@ "Answer for Which numbers are present in stream-1 but not in stream-2? is not right." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-compare", + "started_at": 1768447536.845885, + "completed_at": 1768447538.430877, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From 6023518ec0e40c07af7e961b726a38e3be3e8eab Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Thu, 15 Jan 2026 11:42:15 +0800 Subject: [PATCH 31/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9973ba761..d01555eb4 100644 --- a/progress.json +++ b/progress.json @@ -354,5 +354,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "merge-squash", + "started_at": 1768448533.730025, + "completed_at": 1768448535.257638, + "comments": [ + "Good job performing a merge squash!" + ], + "status": "Completed" } ] \ No newline at end of file From 3434f3b9ae35b95cde4c052b4755330425722dc6 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Thu, 15 Jan 2026 11:53:19 +0800 Subject: [PATCH 32/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d01555eb4..021deffee 100644 --- a/progress.json +++ b/progress.json @@ -363,5 +363,14 @@ "Good job performing a merge squash!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1768449197.952892, + "completed_at": 1768449199.353783, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 9ee68ae8de2b33c3064f2d70eec6d3fdd18e43e8 Mon Sep 17 00:00:00 2001 From: James <73779218+Somebody-somewher@users.noreply.github.com> Date: Thu, 15 Jan 2026 11:58:03 +0800 Subject: [PATCH 33/33] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 021deffee..ceb25e1bf 100644 --- a/progress.json +++ b/progress.json @@ -372,5 +372,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1768449481.641744, + "completed_at": 1768449483.020511, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file