From dbc6bfa0db911d487a481044b9e222cbbc2a176f Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 18:02:45 +0800 Subject: [PATCH 01/40] Sync progress with local machine --- progress.json | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..c8daacfde --- /dev/null +++ b/progress.json @@ -0,0 +1,72 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1768056946.262123, + "completed_at": 1768056947.670248, + "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": 1768060577.566954, + "completed_at": 1768060579.116053, + "comments": [], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1768053230.204352, + "completed_at": 1768053231.721757, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "staging-intervention", + "started_at": 1768055448.850343, + "completed_at": 1768055450.269497, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1768052514.346517, + "completed_at": 1768052515.82608, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1768052636.541776, + "completed_at": 1768052638.215504, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1768052685.373946, + "completed_at": 1768052686.688885, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "undo-init", + "started_at": 1768052769.125391, + "completed_at": 1768052770.411132, + "comments": [ + "You have successfully undone the init operation!" + ], + "status": "Completed" + } +] \ No newline at end of file From 8717d91f2fc719f8466029d64174a645fc38464f Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 18:09:06 +0800 Subject: [PATCH 02/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c8daacfde..d2031de69 100644 --- a/progress.json +++ b/progress.json @@ -68,5 +68,14 @@ "You have successfully undone the init operation!" ], "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1768212368.007933, + "completed_at": 1768212545.4273, + "comments": [ + "That is not the right Github url!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 7b5ffb31325eeb885b1a75ffdec9bc623acffcb3 Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 18:10:09 +0800 Subject: [PATCH 03/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d2031de69..79254dc0a 100644 --- a/progress.json +++ b/progress.json @@ -77,5 +77,14 @@ "That is not the right Github url!" ], "status": "Incomplete" + }, + { + "exercise_name": "remote-control", + "started_at": 1768212603.135871, + "completed_at": 1768212609.055542, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 84908c58b74cb2e17ef0de5eb3afed8f6f080997 Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 18:19:53 +0800 Subject: [PATCH 04/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 79254dc0a..7c147b616 100644 --- a/progress.json +++ b/progress.json @@ -86,5 +86,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1768213191.167971, + "completed_at": 1768213193.059831, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" } ] \ No newline at end of file From c1db9b1b9b0a5613c832cc1b7b1d8498948ce834 Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 18:27:39 +0800 Subject: [PATCH 05/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7c147b616..e4f72a088 100644 --- a/progress.json +++ b/progress.json @@ -95,5 +95,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1768213654.164213, + "completed_at": 1768213657.342464, + "comments": [ + "You should have made a separate commit!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 40c065293c3048196e1845340cb778ea0e432600 Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 18:45:19 +0800 Subject: [PATCH 06/40] Reset progress for push-over --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index e4f72a088..7c147b616 100644 --- a/progress.json +++ b/progress.json @@ -95,14 +95,5 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" - }, - { - "exercise_name": "push-over", - "started_at": 1768213654.164213, - "completed_at": 1768213657.342464, - "comments": [ - "You should have made a separate commit!" - ], - "status": "Incomplete" } ] \ No newline at end of file From eccb1e58ac586adc2cb20bca8cc3ecee9fc843bb Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 18:46:32 +0800 Subject: [PATCH 07/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7c147b616..b2b219cc6 100644 --- a/progress.json +++ b/progress.json @@ -95,5 +95,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1768214788.26528, + "completed_at": 1768214791.26476, + "comments": [ + "You should have made a separate commit!" + ], + "status": "Incomplete" } ] \ No newline at end of file From c85ff062881688a59847e0db421781f6760ce2b1 Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 18:51:30 +0800 Subject: [PATCH 08/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b2b219cc6..f3f89d5e4 100644 --- a/progress.json +++ b/progress.json @@ -104,5 +104,14 @@ "You should have made a separate commit!" ], "status": "Incomplete" + }, + { + "exercise_name": "push-over", + "started_at": 1768215087.393611, + "completed_at": 1768215089.537508, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From bcd04e070efd0519c31c347773aef22922b747ed Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 20:36:07 +0800 Subject: [PATCH 09/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f3f89d5e4..52e3dde35 100644 --- a/progress.json +++ b/progress.json @@ -113,5 +113,14 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1768221355.158643, + "completed_at": 1768221367.358876, + "comments": [ + "You are not ignoring runaway.txt. Find where the file is and fix that." + ], + "status": "Incomplete" } ] \ No newline at end of file From 6a6729f6c89d50a160a99ae30f354bc3f7e503d5 Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 20:39:46 +0800 Subject: [PATCH 10/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 52e3dde35..a4796d696 100644 --- a/progress.json +++ b/progress.json @@ -122,5 +122,14 @@ "You are not ignoring runaway.txt. Find where the file is and fix that." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1768221582.247315, + "completed_at": 1768221585.957327, + "comments": [ + "You are not ignoring runaway.txt. Find where the file is and fix that." + ], + "status": "Incomplete" } ] \ No newline at end of file From 7fa4c1c714f1e2603a6f664cf22a9a7724d3d8a5 Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 20:42:24 +0800 Subject: [PATCH 11/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a4796d696..6b3ef4531 100644 --- a/progress.json +++ b/progress.json @@ -131,5 +131,14 @@ "You are not ignoring runaway.txt. Find where the file is and fix that." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1768221741.761769, + "completed_at": 1768221744.084886, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" } ] \ No newline at end of file From 587f4dba8a2d738f61b91d268dc5fb9f3f2e94b4 Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 20:52:28 +0800 Subject: [PATCH 12/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6b3ef4531..6381982e1 100644 --- a/progress.json +++ b/progress.json @@ -140,5 +140,14 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1768222341.320763, + "completed_at": 1768222347.936191, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From d9a8d0302250f2a728bf813da758e803a16545ee Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 21:42:36 +0800 Subject: [PATCH 13/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6381982e1..35466dbcd 100644 --- a/progress.json +++ b/progress.json @@ -149,5 +149,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1768225352.574645, + "completed_at": 1768225356.32634, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 4f751ddac1fb99aba0098a84eee3aa5eb8491fee Mon Sep 17 00:00:00 2001 From: tricia Date: Mon, 12 Jan 2026 21:53:00 +0800 Subject: [PATCH 14/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 35466dbcd..759e8765a 100644 --- a/progress.json +++ b/progress.json @@ -158,5 +158,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1768225978.077201, + "completed_at": 1768225979.433997, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From 132ea68655230cd436e29519176173110f107152 Mon Sep 17 00:00:00 2001 From: tricia Date: Tue, 13 Jan 2026 12:07:51 +0800 Subject: [PATCH 15/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 759e8765a..2b27aa7db 100644 --- a/progress.json +++ b/progress.json @@ -167,5 +167,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1768277268.64852, + "completed_at": 1768277270.123416, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" } ] \ No newline at end of file From 15c9dab43b0105150d2d555c2ef20123b5ea9037 Mon Sep 17 00:00:00 2001 From: tricia Date: Tue, 13 Jan 2026 12:37:33 +0800 Subject: [PATCH 16/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 2b27aa7db..cd4ee46cf 100644 --- a/progress.json +++ b/progress.json @@ -176,5 +176,14 @@ "Great work in viewing and understanding the diff of a specific commit!" ], "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1768279050.760546, + "completed_at": 1768279052.163215, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 32fd43543a070c19705b11387a8ae186d4a469f2 Mon Sep 17 00:00:00 2001 From: tricia Date: Tue, 13 Jan 2026 14:48:06 +0800 Subject: [PATCH 17/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index cd4ee46cf..7d2304177 100644 --- a/progress.json +++ b/progress.json @@ -185,5 +185,14 @@ "Great work using git tag to annotate various commits in the repository!" ], "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1768286883.770966, + "completed_at": 1768286885.662869, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" } ] \ No newline at end of file From a14d10b0e0d06ce0ad11d2bbc69ed7b49b9eb2fa Mon Sep 17 00:00:00 2001 From: tricia Date: Tue, 13 Jan 2026 15:01:01 +0800 Subject: [PATCH 18/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7d2304177..6773431da 100644 --- a/progress.json +++ b/progress.json @@ -194,5 +194,14 @@ "Great work! You have successfully updated the tags to point to the correct commits." ], "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1768287657.980724, + "completed_at": 1768287660.463828, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" } ] \ No newline at end of file From 0072484665e09277d99d98502475a6b9d47b9e0e Mon Sep 17 00:00:00 2001 From: tricia Date: Tue, 13 Jan 2026 22:38:07 +0800 Subject: [PATCH 19/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6773431da..96b98e97a 100644 --- a/progress.json +++ b/progress.json @@ -203,5 +203,14 @@ "Wonderful! You have successfully synced the local tags with the remote tags!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1768315083.423079, + "completed_at": 1768315086.744822, + "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 a3bdf70930ae37359725b69d20f7b4473a85ce16 Mon Sep 17 00:00:00 2001 From: tricia Date: Tue, 13 Jan 2026 22:38:43 +0800 Subject: [PATCH 20/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 96b98e97a..ad8af3c33 100644 --- a/progress.json +++ b/progress.json @@ -212,5 +212,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": 1768315121.781552, + "completed_at": 1768315123.202468, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" } ] \ No newline at end of file From 9206b93c66a1a838fd8ca66827b3176481ebc3d7 Mon Sep 17 00:00:00 2001 From: tricia Date: Tue, 13 Jan 2026 23:00:55 +0800 Subject: [PATCH 21/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ad8af3c33..1f4afc06b 100644 --- a/progress.json +++ b/progress.json @@ -221,5 +221,14 @@ "Great work comparing commits in git history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-checkout", + "started_at": 1768316452.943777, + "completed_at": 1768316454.37479, + "comments": [ + "Great work traversing the revision history!" + ], + "status": "Completed" } ] \ No newline at end of file From 98471cdb1c870565aed7e08810560066cac5fb85 Mon Sep 17 00:00:00 2001 From: tricia Date: Wed, 14 Jan 2026 09:45:32 +0800 Subject: [PATCH 22/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1f4afc06b..2021e92e3 100644 --- a/progress.json +++ b/progress.json @@ -230,5 +230,14 @@ "Great work traversing the revision history!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1768355130.153551, + "completed_at": 1768355131.554999, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" } ] \ No newline at end of file From f06bbb4d14c51389da0c21052edf581fb194d1dc Mon Sep 17 00:00:00 2001 From: tricia Date: Wed, 14 Jan 2026 10:54:17 +0800 Subject: [PATCH 23/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 2021e92e3..c8232fd85 100644 --- a/progress.json +++ b/progress.json @@ -239,5 +239,14 @@ "You have reset the repository to the correct state!" ], "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1768359252.462124, + "completed_at": 1768359257.116567, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" } ] \ No newline at end of file From b1c9f5c8ebe11d2a1f1b976d5d342ba1b817d022 Mon Sep 17 00:00:00 2001 From: tricia Date: Thu, 15 Jan 2026 12:16:14 +0800 Subject: [PATCH 24/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c8232fd85..785b84441 100644 --- a/progress.json +++ b/progress.json @@ -248,5 +248,14 @@ "Good work reverting commits!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1768450570.322851, + "completed_at": 1768450573.503843, + "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 b75b4bee418c1562d706b29f63d79ea70be2f9e1 Mon Sep 17 00:00:00 2001 From: tricia Date: Thu, 15 Jan 2026 12:16:36 +0800 Subject: [PATCH 25/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 785b84441..4676f3b65 100644 --- a/progress.json +++ b/progress.json @@ -257,5 +257,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1768450593.900983, + "completed_at": 1768450595.306045, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 40cb574555efd4ad295288ebe9d95737bb6c217f Mon Sep 17 00:00:00 2001 From: tricia Date: Thu, 15 Jan 2026 12:21:25 +0800 Subject: [PATCH 26/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4676f3b65..7ba3f8f8a 100644 --- a/progress.json +++ b/progress.json @@ -266,5 +266,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1768450883.18902, + "completed_at": 1768450884.838998, + "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 7ac31346af87de3d61bbffffee06b409a6f5be0a Mon Sep 17 00:00:00 2001 From: tricia Date: Thu, 15 Jan 2026 22:47:27 +0800 Subject: [PATCH 27/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7ba3f8f8a..7cd968b50 100644 --- a/progress.json +++ b/progress.json @@ -275,5 +275,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1768488445.431981, + "completed_at": 1768488446.870556, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 1358324e5b769eee35cf6e4409a9fcf8f8f3d235 Mon Sep 17 00:00:00 2001 From: tricia Date: Thu, 15 Jan 2026 22:51:02 +0800 Subject: [PATCH 28/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7cd968b50..71a9c170f 100644 --- a/progress.json +++ b/progress.json @@ -284,5 +284,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1768488659.731109, + "completed_at": 1768488661.140924, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From 62c31de814ef747c0ff2f2709b06c5dd1d843240 Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 10:23:50 +0800 Subject: [PATCH 29/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 71a9c170f..b0c6e170f 100644 --- a/progress.json +++ b/progress.json @@ -293,5 +293,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1768530228.523128, + "completed_at": 1768530229.967618, + "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 445c08250d9e534f73e3d449447c04458030ffcf Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 10:40:43 +0800 Subject: [PATCH 30/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b0c6e170f..7268249a6 100644 --- a/progress.json +++ b/progress.json @@ -302,5 +302,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1768531240.696994, + "completed_at": 1768531243.331713, + "comments": [ + "You have successfully undone the merge of branch 'others'." + ], + "status": "Completed" } ] \ No newline at end of file From d2b1a420ac9b6ee238581e7de021ce0bbcf925f1 Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 11:11:50 +0800 Subject: [PATCH 31/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7268249a6..fbb6e6a4a 100644 --- a/progress.json +++ b/progress.json @@ -311,5 +311,14 @@ "You have successfully undone the merge of branch 'others'." ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1768533108.619258, + "completed_at": 1768533110.185716, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From cc2d98e91a3ae7382012b30f15211fa02db783f3 Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 11:21:05 +0800 Subject: [PATCH 32/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fbb6e6a4a..977716aab 100644 --- a/progress.json +++ b/progress.json @@ -320,5 +320,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "merge-squash", + "started_at": 1768533661.66167, + "completed_at": 1768533664.848082, + "comments": [ + "You have not committed the staged files! Remember, you need to manually commit after a squash merge!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 7845c7778231ace639264b9911afec233b27353f Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 11:22:49 +0800 Subject: [PATCH 33/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 977716aab..76cbee026 100644 --- a/progress.json +++ b/progress.json @@ -329,5 +329,14 @@ "You have not committed the staged files! Remember, you need to manually commit after a squash merge!" ], "status": "Incomplete" + }, + { + "exercise_name": "merge-squash", + "started_at": 1768533767.058708, + "completed_at": 1768533768.700831, + "comments": [ + "Good job performing a merge squash!" + ], + "status": "Completed" } ] \ No newline at end of file From 6fd6e5e60ed7330217e2315a6c4a803b5c0a63f8 Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 13:02:22 +0800 Subject: [PATCH 34/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 76cbee026..37acd645d 100644 --- a/progress.json +++ b/progress.json @@ -338,5 +338,14 @@ "Good job performing a merge squash!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1768539740.88792, + "completed_at": 1768539742.303596, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From cd2311eee5755550ef61738d6818a5141ed82458 Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 13:46:21 +0800 Subject: [PATCH 35/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 37acd645d..bdec71457 100644 --- a/progress.json +++ b/progress.json @@ -347,5 +347,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1768542379.60275, + "completed_at": 1768542381.112064, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 5641f492c23cda6dc790fd206fb1722bbdcb526f Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 16:50:45 +0800 Subject: [PATCH 36/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index bdec71457..0ee0d26fb 100644 --- a/progress.json +++ b/progress.json @@ -356,5 +356,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1768553443.954742, + "completed_at": 1768553445.26742, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file From a405dd5f31634ca3906a15904e03811b2fddf1a2 Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 16:59:31 +0800 Subject: [PATCH 37/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0ee0d26fb..210e39e18 100644 --- a/progress.json +++ b/progress.json @@ -365,5 +365,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1768553968.031516, + "completed_at": 1768553971.329787, + "comments": [ + "Branch 'feature-delete' still exists! Remember to delete it after merging!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 2305e89d32fac6b69a0558f5b0e3670b7b06604d Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 17:00:04 +0800 Subject: [PATCH 38/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 210e39e18..ec75f6f00 100644 --- a/progress.json +++ b/progress.json @@ -374,5 +374,14 @@ "Branch 'feature-delete' still exists! Remember to delete it after merging!" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1768554001.124437, + "completed_at": 1768554004.410787, + "comments": [ + "Branch 'list' still exists! Remember to rename it to 'feature-list'!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 0024af83ab7225f930cfc8a2fdb3501477bc3a20 Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 17:01:06 +0800 Subject: [PATCH 39/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ec75f6f00..5358985dd 100644 --- a/progress.json +++ b/progress.json @@ -383,5 +383,14 @@ "Branch 'list' still exists! Remember to rename it to 'feature-list'!" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1768554064.107835, + "completed_at": 1768554065.756705, + "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 a803f8fcd4ba1571d8597efa0af8976bccbb5346 Mon Sep 17 00:00:00 2001 From: tricia Date: Fri, 16 Jan 2026 19:15:15 +0800 Subject: [PATCH 40/40] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5358985dd..ba583bf43 100644 --- a/progress.json +++ b/progress.json @@ -392,5 +392,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": 1768562113.1276, + "completed_at": 1768562114.760081, + "comments": [ + "You have successfully completed the exercise!" + ], + "status": "Completed" } ] \ No newline at end of file