From 034bba1b34d0495bc017315a5995a159790f87b4 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 17:21:25 +0800 Subject: [PATCH 01/25] Sync progress with local machine --- progress.json | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 0000000000..fe80a4a6d2 --- /dev/null +++ b/progress.json @@ -0,0 +1,99 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1788338813.593434, + "completed_at": 1788338817.272353, + "comments": [ + "There are no new grocery list items added to the shopping list." + ], + "status": "Incomplete" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1788338858.500761, + "completed_at": 1788338860.563086, + "comments": [ + "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!" + ], + "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1788340470.934318, + "completed_at": 1788340477.385599, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1788340263.396386, + "completed_at": 1788340265.440901, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" + }, + { + "exercise_name": "log-and-order", + "started_at": 1788339068.745518, + "completed_at": 1788339070.763345, + "comments": [], + "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1788340397.9649, + "completed_at": 1788340400.797427, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1788340182.577989, + "completed_at": 1788340215.955421, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1788338746.694361, + "completed_at": 1788338748.644463, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "staging-intervention", + "started_at": 1788338928.650011, + "completed_at": 1788338930.580154, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1788338567.154505, + "completed_at": 1788338569.079382, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "undo-init", + "started_at": 1788338678.265856, + "completed_at": 1788338680.315453, + "comments": [ + "You have successfully undone the init operation!" + ], + "status": "Completed" + } +] \ No newline at end of file From e043533bafd17930cff11e3e7640ec15a73cd25c Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 20:51:30 +0800 Subject: [PATCH 02/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fe80a4a6d2..a68d942518 100644 --- a/progress.json +++ b/progress.json @@ -95,5 +95,14 @@ "You have successfully undone the init operation!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1788353485.354287, + "completed_at": 1788353490.180252, + "comments": [ + "No fork of git-mastery/gm-shapes found. Remember to fork it from https://github.com/git-mastery/gm-shapes and keep the name as gm-shapes" + ], + "status": "Incomplete" } ] \ No newline at end of file From ee90eabf6923a990d8c179177c464db04e1f4ae2 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 20:52:42 +0800 Subject: [PATCH 03/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a68d942518..4aa03e4b86 100644 --- a/progress.json +++ b/progress.json @@ -104,5 +104,14 @@ "No fork of git-mastery/gm-shapes found. Remember to fork it from https://github.com/git-mastery/gm-shapes and keep the name as gm-shapes" ], "status": "Incomplete" + }, + { + "exercise_name": "fork-repo", + "started_at": 1788353557.621453, + "completed_at": 1788353561.725696, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 0dc071fc29219f95fafb778ac074b5a420219934 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 20:53:55 +0800 Subject: [PATCH 04/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4aa03e4b86..a842eb6d8b 100644 --- a/progress.json +++ b/progress.json @@ -113,5 +113,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1788353628.982259, + "completed_at": 1788353634.473767, + "comments": [ + "Clone named shapes is missing! Remember to clone your fork using the name 'shapes', not 'gm-shapes'!" + ], + "status": "Incomplete" } ] \ No newline at end of file From bedbc64eba303b2613f33460969d434d05178ec3 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 20:55:58 +0800 Subject: [PATCH 05/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a842eb6d8b..20ddfc2436 100644 --- a/progress.json +++ b/progress.json @@ -122,5 +122,14 @@ "Clone named shapes is missing! Remember to clone your fork using the name 'shapes', not 'gm-shapes'!" ], "status": "Incomplete" + }, + { + "exercise_name": "clone-repo", + "started_at": 1788353754.213734, + "completed_at": 1788353757.770443, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 6ff1ed3c749d3d436eb7b60ec0e5c76e60db41e6 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 20:57:41 +0800 Subject: [PATCH 06/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 20ddfc2436..a7f9ce9dec 100644 --- a/progress.json +++ b/progress.json @@ -131,5 +131,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1788353857.221998, + "completed_at": 1788353861.322618, + "comments": [ + "Remote 'alice-upstream' is missing! Remember to add it and point it to https://github.com/git-mastery/gm-shapes-alice" + ], + "status": "Incomplete" } ] \ No newline at end of file From 875abfc8ea3ccb544456a40ea50db69dd459a49b Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 20:59:38 +0800 Subject: [PATCH 07/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a7f9ce9dec..d86526b3db 100644 --- a/progress.json +++ b/progress.json @@ -140,5 +140,14 @@ "Remote 'alice-upstream' is missing! Remember to add it and point it to https://github.com/git-mastery/gm-shapes-alice" ], "status": "Incomplete" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1788353976.105283, + "completed_at": 1788353978.257423, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From 48568084a37b523acc8eecdec27c1fac872a0eed Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 21:12:57 +0800 Subject: [PATCH 08/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d86526b3db..48d3a662fc 100644 --- a/progress.json +++ b/progress.json @@ -149,5 +149,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1788354774.784453, + "completed_at": 1788354776.792356, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" } ] \ No newline at end of file From 3ca872f6df4ed2a1456961ff3990853ce14c3811 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 21:23:54 +0800 Subject: [PATCH 09/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 48d3a662fc..ba9002bac9 100644 --- a/progress.json +++ b/progress.json @@ -158,5 +158,14 @@ "Great work in viewing and understanding the diff of a specific commit!" ], "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1788355432.089864, + "completed_at": 1788355434.198454, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 7d07138e2b5cc2dbd880061bd504ac74f2634323 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 21:26:21 +0800 Subject: [PATCH 10/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ba9002bac9..e6bc110725 100644 --- a/progress.json +++ b/progress.json @@ -167,5 +167,14 @@ "Great work using git tag to annotate various commits in the repository!" ], "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1788355578.899172, + "completed_at": 1788355581.236797, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" } ] \ No newline at end of file From 425a6fd84f4210d9324f7214d532de447e13894e Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 21:28:36 +0800 Subject: [PATCH 11/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e6bc110725..7600bcc58b 100644 --- a/progress.json +++ b/progress.json @@ -176,5 +176,14 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1788355713.05032, + "completed_at": 1788355716.123257, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" } ] \ No newline at end of file From 6f0c7758fbb10bf2c8303456118d84d70a6e63b7 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 21:35:32 +0800 Subject: [PATCH 12/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7600bcc58b..afe8213a15 100644 --- a/progress.json +++ b/progress.json @@ -185,5 +185,14 @@ "Wonderful! You have successfully synced the local tags with the remote tags!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1788356129.5217, + "completed_at": 1788356131.46149, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" } ] \ No newline at end of file From b6f48527b450ecdcce77b74d57deae9ffb920903 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 21:39:52 +0800 Subject: [PATCH 13/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index afe8213a15..f202d3a9c0 100644 --- a/progress.json +++ b/progress.json @@ -194,5 +194,14 @@ "Great work comparing commits in git history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-checkout", + "started_at": 1788356389.593925, + "completed_at": 1788356391.798396, + "comments": [ + "Great work traversing the revision history!" + ], + "status": "Completed" } ] \ No newline at end of file From 806494b2f578b40b42e6467e12b6d12efa372a10 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 21:43:07 +0800 Subject: [PATCH 14/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f202d3a9c0..dbe343e482 100644 --- a/progress.json +++ b/progress.json @@ -203,5 +203,14 @@ "Great work traversing the revision history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1788356584.203076, + "completed_at": 1788356586.600077, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" } ] \ No newline at end of file From bf77456fd96a0ec0a3f44b26ee49d625a516ef75 Mon Sep 17 00:00:00 2001 From: lwz Date: Wed, 2 Sep 2026 21:51:02 +0800 Subject: [PATCH 15/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index dbe343e482..28ad8c3086 100644 --- a/progress.json +++ b/progress.json @@ -212,5 +212,14 @@ "You have reset the repository to the correct state!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1788357059.365469, + "completed_at": 1788357061.632396, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" } ] \ No newline at end of file From 958b19b706aae1b76ef7d4c58b0239a1890a55a8 Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 09:01:55 +0800 Subject: [PATCH 16/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 28ad8c3086..ac3c3a4e71 100644 --- a/progress.json +++ b/progress.json @@ -221,5 +221,14 @@ "Good work reverting commits!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1788397312.399031, + "completed_at": 1788397314.466837, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From badf9fbcb26d93335fd93d7c6474dc82123859fa Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 09:05:24 +0800 Subject: [PATCH 17/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ac3c3a4e71..e7dc6e8489 100644 --- a/progress.json +++ b/progress.json @@ -230,5 +230,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1788397521.58674, + "completed_at": 1788397523.761088, + "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 7c45ae900c5375093660f40c128ec85566814ca5 Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 09:26:57 +0800 Subject: [PATCH 18/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e7dc6e8489..9fd732c6e5 100644 --- a/progress.json +++ b/progress.json @@ -239,5 +239,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1788398813.716765, + "completed_at": 1788398816.495557, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From ba5c4e75d4714113420a0c38bab801d01322b3e1 Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 14:25:11 +0800 Subject: [PATCH 19/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9fd732c6e5..bedb014746 100644 --- a/progress.json +++ b/progress.json @@ -248,5 +248,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1788416709.11091, + "completed_at": 1788416711.001757, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 98c0fb76510971ee2294fc088b8d5039454a1d8c Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 14:26:37 +0800 Subject: [PATCH 20/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index bedb014746..9dfc50ba9b 100644 --- a/progress.json +++ b/progress.json @@ -257,5 +257,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1788416795.240015, + "completed_at": 1788416797.198292, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From 5b78768bfd673afa209dc7b8a4f7f931719be97a Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 14:35:21 +0800 Subject: [PATCH 21/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9dfc50ba9b..913e2c3eca 100644 --- a/progress.json +++ b/progress.json @@ -266,5 +266,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1788417319.444865, + "completed_at": 1788417321.397612, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 77d0dffa83761a64776e9161668e91c332f2cab7 Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 14:39:50 +0800 Subject: [PATCH 22/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 913e2c3eca..44d246655d 100644 --- a/progress.json +++ b/progress.json @@ -275,5 +275,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1788417587.589944, + "completed_at": 1788417589.718974, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From d7434cb00bb4a19de9ce61ae8bb98abbd0929381 Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 15:03:09 +0800 Subject: [PATCH 23/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 44d246655d..ea205d2187 100644 --- a/progress.json +++ b/progress.json @@ -284,5 +284,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1788418987.556222, + "completed_at": 1788418989.504312, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file From e443097febd2cd1d37f4e57ee61fc232935bf5c9 Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 15:06:22 +0800 Subject: [PATCH 24/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ea205d2187..c6582415e9 100644 --- a/progress.json +++ b/progress.json @@ -293,5 +293,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1788419179.738776, + "completed_at": 1788419181.956985, + "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 ef6b4c49fb6b9853d16996ad71f85181d4d04cc4 Mon Sep 17 00:00:00 2001 From: lwz Date: Thu, 3 Sep 2026 15:29:08 +0800 Subject: [PATCH 25/25] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c6582415e9..7457d9c817 100644 --- a/progress.json +++ b/progress.json @@ -302,5 +302,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": 1788420545.618871, + "completed_at": 1788420548.050073, + "comments": [ + "You have successfully completed the exercise!" + ], + "status": "Completed" } ] \ No newline at end of file