From 0a3f6c9f7aeda24acdfa6c03e0611381e12bea57 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 29 Aug 2026 18:22:37 +0800 Subject: [PATCH 01/37] Sync progress with local machine --- progress.json | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 0000000000..7f4118cb27 --- /dev/null +++ b/progress.json @@ -0,0 +1,61 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1787883916.727853, + "completed_at": 1787883918.048384, + "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": 1787885308.511332, + "completed_at": 1787885309.782706, + "comments": [], + "status": "Completed" + }, + { + "exercise_name": "log-and-order", + "started_at": 1787998404.968014, + "completed_at": 1787998406.362683, + "comments": [], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1787883094.309685, + "completed_at": 1787883095.594713, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "staging-intervention", + "started_at": 1787884216.205114, + "completed_at": 1787884217.509682, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1787838031.581798, + "completed_at": 1787838032.950754, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "undo-init", + "started_at": 1787838148.890003, + "completed_at": 1787838150.311224, + "comments": [ + "You have successfully undone the init operation!" + ], + "status": "Completed" + } +] \ No newline at end of file From 3ed40fec77533f297308cfc7b00ae7cecfaba233 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 29 Aug 2026 18:30:44 +0800 Subject: [PATCH 02/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7f4118cb27..bbd3563f8d 100644 --- a/progress.json +++ b/progress.json @@ -57,5 +57,14 @@ "You have successfully undone the init operation!" ], "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1787999346.346121, + "completed_at": 1787999444.499385, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 8d0704d0fe84b39ff40c42f3f5e7ab6089d87212 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 29 Aug 2026 18:38:06 +0800 Subject: [PATCH 03/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index bbd3563f8d..a2c00fce53 100644 --- a/progress.json +++ b/progress.json @@ -66,5 +66,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1787999884.759343, + "completed_at": 1787999886.130478, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 3f63a1232461720e381dd34660cb60919c44fcf5 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 29 Aug 2026 18:53:12 +0800 Subject: [PATCH 04/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a2c00fce53..b4649cbe99 100644 --- a/progress.json +++ b/progress.json @@ -75,5 +75,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1788000789.761283, + "completed_at": 1788000791.909054, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From e64599e6a83b439c178d13ddc8e1f5e479f8d3e3 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 29 Aug 2026 19:07:25 +0800 Subject: [PATCH 05/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b4649cbe99..c642ae777f 100644 --- a/progress.json +++ b/progress.json @@ -84,5 +84,14 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1788001642.326302, + "completed_at": 1788001644.205358, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" } ] \ No newline at end of file From 87e9a9905c585ddabd47c7d3c0d0aa7f812aa434 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sun, 30 Aug 2026 01:29:22 +0800 Subject: [PATCH 06/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c642ae777f..b6626e7540 100644 --- a/progress.json +++ b/progress.json @@ -93,5 +93,14 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1788024558.54729, + "completed_at": 1788024562.091692, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From be0e37562ad0c8cf4d6709ff0c9112a3a2c27f6c Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sun, 30 Aug 2026 01:45:19 +0800 Subject: [PATCH 07/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b6626e7540..7587c6e347 100644 --- a/progress.json +++ b/progress.json @@ -102,5 +102,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1788025515.700449, + "completed_at": 1788025519.059088, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 48c9385f5279160b11b2bf96539a11f2e60d29e9 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sun, 30 Aug 2026 02:04:10 +0800 Subject: [PATCH 08/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7587c6e347..597564676a 100644 --- a/progress.json +++ b/progress.json @@ -111,5 +111,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1788026648.831071, + "completed_at": 1788026650.140547, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From 37830e350af95a9dbcfd2d9b45924f1555c54c43 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sun, 30 Aug 2026 21:19:47 +0800 Subject: [PATCH 09/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 597564676a..6f5749458d 100644 --- a/progress.json +++ b/progress.json @@ -120,5 +120,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1788095986.043098, + "completed_at": 1788095987.459561, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" } ] \ No newline at end of file From 56154734e89284ca55c8c9186671beae17ebdca9 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sun, 30 Aug 2026 21:33:40 +0800 Subject: [PATCH 10/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6f5749458d..ba1a8f4ca8 100644 --- a/progress.json +++ b/progress.json @@ -129,5 +129,14 @@ "Great work in viewing and understanding the diff of a specific commit!" ], "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1788096818.483128, + "completed_at": 1788096820.279299, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" } ] \ No newline at end of file From fafdc21c1cc886837f894686cdd554f853ed2c5b Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sun, 30 Aug 2026 21:36:01 +0800 Subject: [PATCH 11/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ba1a8f4ca8..a6dad49fee 100644 --- a/progress.json +++ b/progress.json @@ -138,5 +138,14 @@ "Great work using git tag to annotate various commits in the repository!" ], "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1788096959.290203, + "completed_at": 1788096960.679169, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" } ] \ No newline at end of file From 21027653b83ea97b0bba30e718cdd5fe4baaeb20 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sun, 30 Aug 2026 21:46:53 +0800 Subject: [PATCH 12/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a6dad49fee..539885259d 100644 --- a/progress.json +++ b/progress.json @@ -147,5 +147,14 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1788097610.029178, + "completed_at": 1788097612.681316, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" } ] \ No newline at end of file From 010e9fc5575cc99a06fc3676b4f87906d36b68fa Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Fri, 4 Sep 2026 12:04:02 +0800 Subject: [PATCH 13/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 539885259d..5109e2d735 100644 --- a/progress.json +++ b/progress.json @@ -156,5 +156,14 @@ "Wonderful! You have successfully synced the local tags with the remote tags!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1788494640.617442, + "completed_at": 1788494642.397619, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" } ] \ No newline at end of file From e7bf3602b4dc716aaba3a34bd8035bc7b4d26b92 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 5 Sep 2026 14:24:40 +0800 Subject: [PATCH 14/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5109e2d735..3bab6c293e 100644 --- a/progress.json +++ b/progress.json @@ -165,5 +165,14 @@ "Great work comparing commits in git history!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1788589478.051577, + "completed_at": 1788589479.529797, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From 5faf3b737008cc863eb6ab2f7dd3c090355624d7 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 5 Sep 2026 14:38:09 +0800 Subject: [PATCH 15/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3bab6c293e..8670dc9986 100644 --- a/progress.json +++ b/progress.json @@ -174,5 +174,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-checkout", + "started_at": 1788590287.830099, + "completed_at": 1788590289.393746, + "comments": [ + "Great work traversing the revision history!" + ], + "status": "Completed" } ] \ No newline at end of file From 3ed9bcb7d4a3b09d1291fd88f075c02057515dae Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 5 Sep 2026 15:02:53 +0800 Subject: [PATCH 16/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8670dc9986..618a0f79d3 100644 --- a/progress.json +++ b/progress.json @@ -183,5 +183,14 @@ "Great work traversing the revision history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1788591771.682276, + "completed_at": 1788591773.166315, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" } ] \ No newline at end of file From 880ee53b232ed5156d12c84689b56453b29b6ef8 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 5 Sep 2026 15:19:49 +0800 Subject: [PATCH 17/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 618a0f79d3..8c47cffecf 100644 --- a/progress.json +++ b/progress.json @@ -192,5 +192,14 @@ "You have reset the repository to the correct state!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1788592787.32977, + "completed_at": 1788592788.814405, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" } ] \ No newline at end of file From 5cc91aef654decd33ef962f6b4b313a2a18bb04a Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 11:37:50 +0800 Subject: [PATCH 18/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8c47cffecf..6bb8e2c486 100644 --- a/progress.json +++ b/progress.json @@ -201,5 +201,14 @@ "Good work reverting commits!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1789184268.516485, + "completed_at": 1789184270.200578, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 20539ee6ee524fe49599d2268b5e50851c8a4bb7 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 11:42:13 +0800 Subject: [PATCH 19/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6bb8e2c486..c2a4abca51 100644 --- a/progress.json +++ b/progress.json @@ -210,5 +210,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1789184531.750174, + "completed_at": 1789184533.297997, + "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 888929f4895a007c89f5cd8032f7da4c1f9bab61 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 11:58:10 +0800 Subject: [PATCH 20/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c2a4abca51..0835d66df7 100644 --- a/progress.json +++ b/progress.json @@ -219,5 +219,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1789185488.275768, + "completed_at": 1789185489.611722, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 93c6be8cffd540998b945ea2680655b5e09d9ead Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 12:00:05 +0800 Subject: [PATCH 21/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0835d66df7..235a38dd55 100644 --- a/progress.json +++ b/progress.json @@ -228,5 +228,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1789185603.870432, + "completed_at": 1789185605.365184, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From 093f1e52432eabe36603961239f8ecb189dd25c5 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 12:03:02 +0800 Subject: [PATCH 22/37] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 235a38dd55..c33960b7ae 100644 --- a/progress.json +++ b/progress.json @@ -237,5 +237,15 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1789185779.355817, + "completed_at": 1789185782.44093, + "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 baca529198778bce67529e4f4937de4d667add2f Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 12:03:46 +0800 Subject: [PATCH 23/37] Reset progress for merge-undo --- progress.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/progress.json b/progress.json index c33960b7ae..235a38dd55 100644 --- a/progress.json +++ b/progress.json @@ -237,15 +237,5 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" - }, - { - "exercise_name": "merge-undo", - "started_at": 1789185779.355817, - "completed_at": 1789185782.44093, - "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 1bd5fab13e81d91e77db6c3cdc4449d66ccaf6e4 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 12:04:20 +0800 Subject: [PATCH 24/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 235a38dd55..2c4e4484a6 100644 --- a/progress.json +++ b/progress.json @@ -237,5 +237,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1789185858.949832, + "completed_at": 1789185860.225046, + "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 5bc60a4f4cc8d95155c99ce31a6c7aa6c654d226 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 12:05:36 +0800 Subject: [PATCH 25/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 2c4e4484a6..58288848ee 100644 --- a/progress.json +++ b/progress.json @@ -246,5 +246,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1789185934.52001, + "completed_at": 1789185935.901242, + "comments": [ + "You have successfully undone the merge of branch 'others'." + ], + "status": "Completed" } ] \ No newline at end of file From 96e69d9da982545bc4236030ca84242227455f79 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 12:08:52 +0800 Subject: [PATCH 26/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 58288848ee..0e3c0a96e3 100644 --- a/progress.json +++ b/progress.json @@ -255,5 +255,14 @@ "You have successfully undone the merge of branch 'others'." ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1789186130.775653, + "completed_at": 1789186132.139833, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From b63b2bbc297c254387929b91f92ed18b04669310 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 12:10:40 +0800 Subject: [PATCH 27/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0e3c0a96e3..ecfa05d0b7 100644 --- a/progress.json +++ b/progress.json @@ -264,5 +264,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "merge-squash", + "started_at": 1789186238.544713, + "completed_at": 1789186239.846696, + "comments": [ + "Good job performing a merge squash!" + ], + "status": "Completed" } ] \ No newline at end of file From 3ca8a83ed46788f478da38ddae1975092eb01918 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 14:00:45 +0800 Subject: [PATCH 28/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ecfa05d0b7..847ec2e0a9 100644 --- a/progress.json +++ b/progress.json @@ -273,5 +273,14 @@ "Good job performing a merge squash!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1789192841.119452, + "completed_at": 1789192844.93057, + "comments": [ + "You still have uncommitted changes. Commit them first on the appropriate branch first!" + ], + "status": "Incomplete" } ] \ No newline at end of file From c60974853e5316d336a1d5aafce3254ddbde932a Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 14:01:36 +0800 Subject: [PATCH 29/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 847ec2e0a9..c84d7fecfb 100644 --- a/progress.json +++ b/progress.json @@ -282,5 +282,14 @@ "You still have uncommitted changes. Commit them first on the appropriate branch first!" ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1789192895.050017, + "completed_at": 1789192896.344661, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 4d83882816a2b051ecf57d0a00819910ba55df29 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 14:05:59 +0800 Subject: [PATCH 30/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c84d7fecfb..5ed6862da5 100644 --- a/progress.json +++ b/progress.json @@ -291,5 +291,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1789193157.447895, + "completed_at": 1789193158.902569, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From dbbb7696726dc1d89134af69304b27992f449ca6 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 14:16:23 +0800 Subject: [PATCH 31/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5ed6862da5..99ec93eac6 100644 --- a/progress.json +++ b/progress.json @@ -300,5 +300,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1789193781.643813, + "completed_at": 1789193783.063933, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file From 61a325ece603c97460218f4673d12ea3cb71fd53 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 14:24:23 +0800 Subject: [PATCH 32/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 99ec93eac6..89af0a8edc 100644 --- a/progress.json +++ b/progress.json @@ -309,5 +309,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1789194261.069008, + "completed_at": 1789194262.530273, + "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 ae729fb4f4fede403ec29a66763e9bc3c0f7f79e Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 14:31:39 +0800 Subject: [PATCH 33/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 89af0a8edc..379229553f 100644 --- a/progress.json +++ b/progress.json @@ -318,5 +318,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": 1789194695.876981, + "completed_at": 1789194699.055922, + "comments": [ + "Contents of 'features.md' is not valid at commit with message 'Add the delete feature'! Try again!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 1f376e2c019b6bba6578dcfc9fa2fa21703884f3 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 14:32:07 +0800 Subject: [PATCH 34/37] Reset progress for mix-messy-graph --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index 379229553f..89af0a8edc 100644 --- a/progress.json +++ b/progress.json @@ -318,14 +318,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": 1789194695.876981, - "completed_at": 1789194699.055922, - "comments": [ - "Contents of 'features.md' is not valid at commit with message 'Add the delete feature'! Try again!" - ], - "status": "Incomplete" } ] \ No newline at end of file From 64112ad1441e9a04ce3c3bb5172b310a100487f7 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Sat, 12 Sep 2026 14:34:56 +0800 Subject: [PATCH 35/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 89af0a8edc..d00bec3286 100644 --- a/progress.json +++ b/progress.json @@ -318,5 +318,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": 1789194894.711077, + "completed_at": 1789194896.116424, + "comments": [ + "You have successfully completed the exercise!" + ], + "status": "Completed" } ] \ No newline at end of file From 1347d3ac89380239fb6e76166afc0dda84b6846b Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Tue, 15 Sep 2026 13:53:27 +0800 Subject: [PATCH 36/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d00bec3286..15657ebbba 100644 --- a/progress.json +++ b/progress.json @@ -327,5 +327,14 @@ "You have successfully completed the exercise!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-push", + "started_at": 1789451605.100942, + "completed_at": 1789451606.505093, + "comments": [ + "Great work pushing the PQR branch to your fork!" + ], + "status": "Completed" } ] \ No newline at end of file From d2cf54266ce98f12a1be0e6e618cea357b2563a0 Mon Sep 17 00:00:00 2001 From: kong-xin-yang <0kingkng0@gmail.com> Date: Tue, 15 Sep 2026 14:08:43 +0800 Subject: [PATCH 37/37] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 15657ebbba..7890215cda 100644 --- a/progress.json +++ b/progress.json @@ -336,5 +336,14 @@ "Great work pushing the PQR branch to your fork!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-pull", + "started_at": 1789452521.886594, + "completed_at": 1789452523.172634, + "comments": [ + "Great work! All required branches are present and correctly set up." + ], + "status": "Completed" } ] \ No newline at end of file