From 7ec0e799542ba39afff7bd6ff939fbcf38cd7459 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 17:13:30 +0800 Subject: [PATCH 01/45] 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 0000000000..e592e3c4c1 --- /dev/null +++ b/progress.json @@ -0,0 +1,11 @@ +[ + { + "exercise_name": "under-control", + "started_at": 1785921208.47115, + "completed_at": 1785921209.933139, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" + } +] \ No newline at end of file From 7dde035e60d4594a378ee63e81b2d056eff388f0 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 17:26:57 +0800 Subject: [PATCH 02/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e592e3c4c1..011d409d79 100644 --- a/progress.json +++ b/progress.json @@ -7,5 +7,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "remote-control", + "started_at": 1785921968.796514, + "completed_at": 1785922016.746249, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 83bfa8367878a7f31f251be4bec48b2eb4da1d82 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 17:29:53 +0800 Subject: [PATCH 03/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 011d409d79..1923abecf5 100644 --- a/progress.json +++ b/progress.json @@ -16,5 +16,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1785922190.386416, + "completed_at": 1785922193.290518, + "comments": [ + "Missing remote called 'upstream'." + ], + "status": "Incomplete" } ] \ No newline at end of file From e72008cf6ad8c566c0d8f495a9a5a9768ec00a18 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 17:39:03 +0800 Subject: [PATCH 04/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1923abecf5..ca8a0c68bf 100644 --- a/progress.json +++ b/progress.json @@ -25,5 +25,14 @@ "Missing remote called 'upstream'." ], "status": "Incomplete" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1785922739.257918, + "completed_at": 1785922742.992332, + "comments": [ + "You have not fetched Alice's changes yet!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 8f4c507fad710d7e98701146fe5e7136ae750867 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 17:41:21 +0800 Subject: [PATCH 05/45] Reset progress for fetch-and-pull --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index ca8a0c68bf..1923abecf5 100644 --- a/progress.json +++ b/progress.json @@ -25,14 +25,5 @@ "Missing remote called 'upstream'." ], "status": "Incomplete" - }, - { - "exercise_name": "fetch-and-pull", - "started_at": 1785922739.257918, - "completed_at": 1785922742.992332, - "comments": [ - "You have not fetched Alice's changes yet!" - ], - "status": "Incomplete" } ] \ No newline at end of file From f25abd7596704ade33e60e412e8cfc2cef0d1a21 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 17:42:32 +0800 Subject: [PATCH 06/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1923abecf5..496dcbb6ea 100644 --- a/progress.json +++ b/progress.json @@ -25,5 +25,14 @@ "Missing remote called 'upstream'." ], "status": "Incomplete" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1785922950.765445, + "completed_at": 1785922952.251309, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From 598915fa80df17cb6c73db508300a8a202e16af2 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 17:59:19 +0800 Subject: [PATCH 07/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 496dcbb6ea..d2d320a300 100644 --- a/progress.json +++ b/progress.json @@ -34,5 +34,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1785923957.133362, + "completed_at": 1785923958.692197, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" } ] \ No newline at end of file From a9019b251f00dd424196e85f491f86be4da9f38f Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 18:02:53 +0800 Subject: [PATCH 08/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d2d320a300..05f1817c00 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "Great work using git tag to annotate various commits in the repository!" ], "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1785924169.628216, + "completed_at": 1785924172.925773, + "comments": [ + "The 'april-update' tag is pointing to the wrong commit. It should point to the April commit." + ], + "status": "Incomplete" } ] \ No newline at end of file From 0853b252ec9e60dfd5101e3fc96f8239ac734d4b Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 18:03:36 +0800 Subject: [PATCH 09/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 05f1817c00..444fb82cf2 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,14 @@ "The 'april-update' tag is pointing to the wrong commit. It should point to the April commit." ], "status": "Incomplete" + }, + { + "exercise_name": "tags-update", + "started_at": 1785924214.096413, + "completed_at": 1785924215.650999, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" } ] \ No newline at end of file From 64a24b9b4cc1c312863d5482fcd2754282d54894 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 18:09:13 +0800 Subject: [PATCH 10/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 444fb82cf2..a285fca4f2 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1785924545.90351, + "completed_at": 1785924552.572674, + "comments": [ + "Tag beta is still on the remote!" + ], + "status": "Incomplete" } ] \ No newline at end of file From ce307f13697d7f1d9452b22db5dfc67a91cc8e5e Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 18:11:31 +0800 Subject: [PATCH 11/45] Reset progress for tags-push --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index a285fca4f2..444fb82cf2 100644 --- a/progress.json +++ b/progress.json @@ -61,14 +61,5 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" - }, - { - "exercise_name": "tags-push", - "started_at": 1785924545.90351, - "completed_at": 1785924552.572674, - "comments": [ - "Tag beta is still on the remote!" - ], - "status": "Incomplete" } ] \ No newline at end of file From c56f586f2e0a912ef505eb3e37906374cc5a74d4 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 18:14:22 +0800 Subject: [PATCH 12/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 444fb82cf2..d5a5f00d8d 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1785924856.997567, + "completed_at": 1785924862.000453, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" } ] \ No newline at end of file From ca1fd65a62ca43d6d3725145f3402cf743f78d8f Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 18:34:21 +0800 Subject: [PATCH 13/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d5a5f00d8d..32cf08bbba 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Wonderful! You have successfully synced the local tags with the remote tags!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1785926057.663213, + "completed_at": 1785926060.834724, + "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 1277da9700b3156eeecf9a663e027a87334c53e6 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 18:34:41 +0800 Subject: [PATCH 14/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 32cf08bbba..06b77d1514 100644 --- a/progress.json +++ b/progress.json @@ -79,5 +79,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": 1785926077.876603, + "completed_at": 1785926080.860125, + "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 aa4050e2dbbb694485ec23478766058a08a293b3 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 18:36:41 +0800 Subject: [PATCH 15/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 06b77d1514..c0a1792a3c 100644 --- a/progress.json +++ b/progress.json @@ -88,5 +88,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": 1785926199.168369, + "completed_at": 1785926200.68377, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" } ] \ No newline at end of file From c5dbf5d0fae63161e3b0229b09fa2e31cd9ae1a8 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 21:13:00 +0800 Subject: [PATCH 16/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c0a1792a3c..0e55d875d9 100644 --- a/progress.json +++ b/progress.json @@ -97,5 +97,14 @@ "Great work comparing commits in git history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-checkout", + "started_at": 1785935578.547977, + "completed_at": 1785935580.010409, + "comments": [ + "Great work traversing the revision history!" + ], + "status": "Completed" } ] \ No newline at end of file From e061e1972155eb8d75961d8bd3e8d5d1e641c564 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 21:23:01 +0800 Subject: [PATCH 17/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0e55d875d9..14722e0467 100644 --- a/progress.json +++ b/progress.json @@ -106,5 +106,14 @@ "Great work traversing the revision history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1785936177.677176, + "completed_at": 1785936180.730135, + "comments": [ + "It seems like the commit from Jan 13 is still present in the commit history." + ], + "status": "Incomplete" } ] \ No newline at end of file From 2b512a50226471f3985e155441a58532c0233a9d Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 21:23:46 +0800 Subject: [PATCH 18/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 14722e0467..cce788fe21 100644 --- a/progress.json +++ b/progress.json @@ -115,5 +115,14 @@ "It seems like the commit from Jan 13 is still present in the commit history." ], "status": "Incomplete" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1785936223.668146, + "completed_at": 1785936225.406651, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" } ] \ No newline at end of file From 0b3c0777ada4855026170317c19298ad4f01becd Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 21:29:09 +0800 Subject: [PATCH 19/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index cce788fe21..164caf9a03 100644 --- a/progress.json +++ b/progress.json @@ -124,5 +124,14 @@ "You have reset the repository to the correct state!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1785936547.417815, + "completed_at": 1785936548.96221, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" } ] \ No newline at end of file From 613345982ffe9daf9af007106c4c7b9577213844 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 22:00:25 +0800 Subject: [PATCH 20/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 164caf9a03..94eea8325a 100644 --- a/progress.json +++ b/progress.json @@ -133,5 +133,14 @@ "Good work reverting commits!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1785938423.097719, + "completed_at": 1785938424.759082, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 58f2611aa88cc2d544a64a0e58873f30fae162e4 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 22:04:20 +0800 Subject: [PATCH 21/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 94eea8325a..c23aa22802 100644 --- a/progress.json +++ b/progress.json @@ -142,5 +142,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1785938656.031546, + "completed_at": 1785938659.213349, + "comments": [ + "The 'visitor-line' branch should have the line 'I heard someone knocking at the door.' added to story.txt." + ], + "status": "Incomplete" } ] \ No newline at end of file From 3c43a81f435acf01648b37411d66411791ece755 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Wed, 5 Aug 2026 22:06:31 +0800 Subject: [PATCH 22/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c23aa22802..d3384e448d 100644 --- a/progress.json +++ b/progress.json @@ -151,5 +151,14 @@ "The 'visitor-line' branch should have the line 'I heard someone knocking at the door.' added to story.txt." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-previous", + "started_at": 1785938789.783987, + "completed_at": 1785938791.378939, + "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 fcd9d533c9a49fdbfc70e0089169754884c57f01 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 11:13:29 +0800 Subject: [PATCH 23/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d3384e448d..a9802ffcaf 100644 --- a/progress.json +++ b/progress.json @@ -160,5 +160,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1785986007.314827, + "completed_at": 1785986008.816328, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 2cbd048918bba5fb2dd8deefd5d151a00771ba96 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 11:15:01 +0800 Subject: [PATCH 24/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a9802ffcaf..f4bd2a35d3 100644 --- a/progress.json +++ b/progress.json @@ -169,5 +169,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1785986099.520236, + "completed_at": 1785986101.121541, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From efd3658a645acde6928f08c88f3fe5c1c925e3e4 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 11:18:17 +0800 Subject: [PATCH 25/45] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index f4bd2a35d3..13daf3e1e1 100644 --- a/progress.json +++ b/progress.json @@ -178,5 +178,15 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1785986294.063698, + "completed_at": 1785986297.070054, + "comments": [ + "The 'main' branch is not pointing to the correct commit. It should be pointing to the commit made just before the merges.", + "Reset the repository using \"gitmastery progress reset\" and start again" + ], + "status": "Incomplete" } ] \ No newline at end of file From 46f14b4c4523b7fa758508edd00870e8ed246c25 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 11:19:01 +0800 Subject: [PATCH 26/45] Reset progress for merge-undo --- progress.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/progress.json b/progress.json index 13daf3e1e1..f4bd2a35d3 100644 --- a/progress.json +++ b/progress.json @@ -178,15 +178,5 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" - }, - { - "exercise_name": "merge-undo", - "started_at": 1785986294.063698, - "completed_at": 1785986297.070054, - "comments": [ - "The 'main' branch is not pointing to the correct commit. It should be pointing to the commit made just before the merges.", - "Reset the repository using \"gitmastery progress reset\" and start again" - ], - "status": "Incomplete" } ] \ No newline at end of file From b9985a63d921b38c51ac94466c891be5533a1d94 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 11:19:39 +0800 Subject: [PATCH 27/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f4bd2a35d3..5b21b84a08 100644 --- a/progress.json +++ b/progress.json @@ -178,5 +178,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1785986377.900534, + "completed_at": 1785986379.396064, + "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 c060520e1e370b76ea7dc6766c7ff04be4dff339 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 11:20:05 +0800 Subject: [PATCH 28/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5b21b84a08..f3e8845837 100644 --- a/progress.json +++ b/progress.json @@ -187,5 +187,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1785986403.069244, + "completed_at": 1785986404.622063, + "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 9f376fa998f23ad115c61b60fe223d806e39ee2d Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 11:22:53 +0800 Subject: [PATCH 29/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f3e8845837..81c2f40c93 100644 --- a/progress.json +++ b/progress.json @@ -196,5 +196,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1785986571.695249, + "completed_at": 1785986573.202531, + "comments": [ + "You have successfully undone the merge of branch 'others'." + ], + "status": "Completed" } ] \ No newline at end of file From fd9974459a37d1ab460ad62795cca08c0497f39f Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 11:27:32 +0800 Subject: [PATCH 30/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 81c2f40c93..d66ed19346 100644 --- a/progress.json +++ b/progress.json @@ -205,5 +205,14 @@ "You have successfully undone the merge of branch 'others'." ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1785986850.295457, + "completed_at": 1785986851.993981, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From f87058a744726f7746602bf692ed76e18bc90e8d Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 12:54:21 +0800 Subject: [PATCH 31/45] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index d66ed19346..55dee1bd38 100644 --- a/progress.json +++ b/progress.json @@ -214,5 +214,15 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1785992057.87533, + "completed_at": 1785992060.882391, + "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 aeda932ad804cfcaee2407c5e709dac1525b42d9 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 12:54:48 +0800 Subject: [PATCH 32/45] Reset progress for conflict-mediator --- progress.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/progress.json b/progress.json index 55dee1bd38..d66ed19346 100644 --- a/progress.json +++ b/progress.json @@ -214,15 +214,5 @@ "Great work comparing the branches successfully!" ], "status": "Completed" - }, - { - "exercise_name": "conflict-mediator", - "started_at": 1785992057.87533, - "completed_at": 1785992060.882391, - "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 5c746acd2ec9f626e00d6bedfec60641d4ea0355 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 12:56:19 +0800 Subject: [PATCH 33/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d66ed19346..59f60ec8b7 100644 --- a/progress.json +++ b/progress.json @@ -214,5 +214,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1785992177.775556, + "completed_at": 1785992179.240745, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 5d31e60e1bbe62381bdfc84ae170f017128532e0 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 12:59:28 +0800 Subject: [PATCH 34/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 59f60ec8b7..5474b9d4b5 100644 --- a/progress.json +++ b/progress.json @@ -223,5 +223,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1785992366.668409, + "completed_at": 1785992368.109809, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 400c55007358412d2461dd3d8fb8314d8f92bd7c Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 13:05:27 +0800 Subject: [PATCH 35/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5474b9d4b5..5ffa42b111 100644 --- a/progress.json +++ b/progress.json @@ -232,5 +232,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1785992725.309373, + "completed_at": 1785992727.041501, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file From aaccd90845b4e54ba400b10fd66f7cc1f4f1c7b1 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 13:14:55 +0800 Subject: [PATCH 36/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5ffa42b111..ea1d649a01 100644 --- a/progress.json +++ b/progress.json @@ -241,5 +241,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1785993292.946533, + "completed_at": 1785993294.635078, + "comments": [ + "Great work using all of the concepts you've learnt about branching to mix the messy documentation!" + ], + "status": "Completed" } ] \ No newline at end of file From 308f72e00811a068734d2ab58fc414e8f415ac2d Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 13:19:16 +0800 Subject: [PATCH 37/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ea1d649a01..1ad6e8f78f 100644 --- a/progress.json +++ b/progress.json @@ -250,5 +250,14 @@ "Great work using all of the concepts you've learnt about branching to mix the messy documentation!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1785993552.620644, + "completed_at": 1785993555.602135, + "comments": [ + "Expected commit message of 'Add the search feature', got 'Fixed' instead." + ], + "status": "Incomplete" } ] \ No newline at end of file From d11015fa5d298547bd3756bb835003926df9152d Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 13:22:01 +0800 Subject: [PATCH 38/45] Reset progress for mix-messy-graph --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index 1ad6e8f78f..ea1d649a01 100644 --- a/progress.json +++ b/progress.json @@ -250,14 +250,5 @@ "Great work using all of the concepts you've learnt about branching to mix the messy documentation!" ], "status": "Completed" - }, - { - "exercise_name": "mix-messy-graph", - "started_at": 1785993552.620644, - "completed_at": 1785993555.602135, - "comments": [ - "Expected commit message of 'Add the search feature', got 'Fixed' instead." - ], - "status": "Incomplete" } ] \ No newline at end of file From 6cd4c7c571b96266eec0977a10daa670b273bd7c Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 13:36:25 +0800 Subject: [PATCH 39/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ea1d649a01..5d41f6428c 100644 --- a/progress.json +++ b/progress.json @@ -250,5 +250,14 @@ "Great work using all of the concepts you've learnt about branching to mix the messy documentation!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1785994583.125003, + "completed_at": 1785994584.999806, + "comments": [ + "You have successfully completed the exercise!" + ], + "status": "Completed" } ] \ No newline at end of file From 12a8bb52637e5bc420d9c28265349d16adce1795 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 15:33:58 +0800 Subject: [PATCH 40/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5d41f6428c..0b3d70d500 100644 --- a/progress.json +++ b/progress.json @@ -259,5 +259,14 @@ "You have successfully completed the exercise!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-push", + "started_at": 1786001636.723749, + "completed_at": 1786001638.175932, + "comments": [ + "Great work pushing the PQR branch to your fork!" + ], + "status": "Completed" } ] \ No newline at end of file From b7dc8463cf795c6d9e7c62ea73857958fa462605 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 15:44:24 +0800 Subject: [PATCH 41/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0b3d70d500..3f2e026101 100644 --- a/progress.json +++ b/progress.json @@ -268,5 +268,14 @@ "Great work pushing the PQR branch to your fork!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-pull", + "started_at": 1786002261.23467, + "completed_at": 1786002264.293664, + "comments": [ + "The local VWX branch does not track origin/VWX." + ], + "status": "Incomplete" } ] \ No newline at end of file From 6195188d969ea6d894a0e561201c11dcbd22e98a Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 15:45:22 +0800 Subject: [PATCH 42/45] Reset progress for glossary-branch-pull --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index 3f2e026101..0b3d70d500 100644 --- a/progress.json +++ b/progress.json @@ -268,14 +268,5 @@ "Great work pushing the PQR branch to your fork!" ], "status": "Completed" - }, - { - "exercise_name": "glossary-branch-pull", - "started_at": 1786002261.23467, - "completed_at": 1786002264.293664, - "comments": [ - "The local VWX branch does not track origin/VWX." - ], - "status": "Incomplete" } ] \ No newline at end of file From d62f3c43df8c9d8a9b70bfc1641ff452ee6ba847 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 17:00:03 +0800 Subject: [PATCH 43/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0b3d70d500..867437c872 100644 --- a/progress.json +++ b/progress.json @@ -268,5 +268,14 @@ "Great work pushing the PQR branch to your fork!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-pull", + "started_at": 1786006801.500544, + "completed_at": 1786006803.172012, + "comments": [ + "Great work! All required branches are present and correctly set up." + ], + "status": "Completed" } ] \ No newline at end of file From b910f98759be82455e98a3a1a77fca00b077a4ca Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 17:05:18 +0800 Subject: [PATCH 44/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 867437c872..0e1662d068 100644 --- a/progress.json +++ b/progress.json @@ -277,5 +277,14 @@ "Great work! All required branches are present and correctly set up." ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-delete", + "started_at": 1786007116.789925, + "completed_at": 1786007118.188359, + "comments": [ + "Great job deleting the VWX branch!" + ], + "status": "Completed" } ] \ No newline at end of file From e7dc5619a608d781e197074f4c702cdb902b2630 Mon Sep 17 00:00:00 2001 From: Koi Yim Date: Thu, 6 Aug 2026 17:21:37 +0800 Subject: [PATCH 45/45] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0e1662d068..beed5d50cd 100644 --- a/progress.json +++ b/progress.json @@ -286,5 +286,14 @@ "Great job deleting the VWX branch!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-rename", + "started_at": 1786008092.572826, + "completed_at": 1786008097.20601, + "comments": [ + "Nice work renaming the branch locally and on the remote!" + ], + "status": "Completed" } ] \ No newline at end of file