From d7050c00c2369f5ae4ce62f8ecb67c7fc70575ad Mon Sep 17 00:00:00 2001 From: Arrus218 <69071162+Arrus218@users.noreply.github.com> Date: Fri, 23 Jan 2026 18:29:42 +0800 Subject: [PATCH 01/17] Add files via upload --- progress.json | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..651b79896 --- /dev/null +++ b/progress.json @@ -0,0 +1,36 @@ +[ + { + "exercise_name": "under-control", + "started_at": 1769163133.234764, + "completed_at": 1769163134.692849, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1769163193.857772, + "completed_at": 1769163195.289045, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1769163307.318884, + "completed_at": 1769163308.792735, + "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": 1769163910.965719, + "completed_at": 1769163912.554786, + "comments": [], + "status": "Completed" + } +] \ No newline at end of file From 2b03e24e7e1ff6637528327ec6d620cd110c34ca Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Thu, 29 Jan 2026 02:30:22 +0800 Subject: [PATCH 02/17] Sync progress with local machine --- progress.json | 199 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 191 insertions(+), 8 deletions(-) diff --git a/progress.json b/progress.json index 651b79896..303a41fa4 100644 --- a/progress.json +++ b/progress.json @@ -1,19 +1,28 @@ [ { - "exercise_name": "under-control", - "started_at": 1769163133.234764, - "completed_at": 1769163134.692849, + "exercise_name": "clone-repo", + "started_at": 1769177428.393068, + "completed_at": 1769177431.820646, "comments": [ - "You successfully used git init to initialize this folder as a Git repository!" + "Great work creating a clone of a fork from Github!" ], "status": "Completed" }, { - "exercise_name": "stage-fright", - "started_at": 1769163193.857772, - "completed_at": 1769163195.289045, + "exercise_name": "fetch-and-pull", + "started_at": 1769177821.715218, + "completed_at": 1769177822.897785, "comments": [ - "Great work! You have successfully checked in all the actors!" + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1769176930.51889, + "completed_at": 1769176933.778171, + "comments": [ + "Great work creating a fork with Github!" ], "status": "Completed" }, @@ -26,11 +35,185 @@ ], "status": "Completed" }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1769171893.901024, + "completed_at": 1769171896.64736, + "comments": [ + "You have not committed the relevant changes yet!" + ], + "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1769171917.47222, + "completed_at": 1769171918.744591, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1769166463.897988, + "completed_at": 1769166465.345015, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" + }, { "exercise_name": "log-and-order", "started_at": 1769163910.965719, "completed_at": 1769163912.554786, "comments": [], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1769171144.082639, + "completed_at": 1769171148.005132, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1769166023.237698, + "completed_at": 1769166136.356996, + "comments": [ + "That is not the right Github url!" + ], + "status": "Incomplete" + }, + { + "exercise_name": "remote-control", + "started_at": 1769166142.36548, + "completed_at": 1769166153.133935, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-checkout", + "started_at": 1769182362.307196, + "completed_at": 1769182363.826554, + "comments": [ + "Great work traversing the revision history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1769181375.005909, + "completed_at": 1769181378.232951, + "comments": [ + "Answer for Which are the new values in staged files? is empty.", + "Answer for Which are the new values in modified but unstaged files? does not contain all of the right answers.", + "Answer for Which files have changed from Jan 09th to Jan 15th? does not contain all of the right answers.", + "Answer for Which new values are new in north.csv on Jan 10th, compared to Jan 01st? is empty." + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1769181523.073702, + "completed_at": 1769181526.053088, + "comments": [ + "Answer for Which files have changed from Jan 09th to Jan 15th? does not contain all of the right answers." + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1769181762.471524, + "completed_at": 1769181763.963419, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1769183202.759761, + "completed_at": 1769183204.247513, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1769183642.571888, + "completed_at": 1769183644.039785, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1769163193.857772, + "completed_at": 1769163195.289045, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1769180125.904359, + "completed_at": 1769180127.071995, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1769180628.035783, + "completed_at": 1769180634.029224, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1769180397.828731, + "completed_at": 1769180399.164588, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1769163133.234764, + "completed_at": 1769163134.692849, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1769178844.295388, + "completed_at": 1769178846.951854, + "comments": [ + "Answer for In January, who were in the Tuesday duty roster? Remove/add extra rows where appropriate. is empty." + ], + "status": "Incomplete" + }, + { + "exercise_name": "view-commits", + "started_at": 1769178912.712309, + "completed_at": 1769178913.924029, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" } ] \ No newline at end of file From 076fefc1606713435666afb67228208be758ac8a Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:29:53 +0800 Subject: [PATCH 03/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 303a41fa4..2b88bd244 100644 --- a/progress.json +++ b/progress.json @@ -215,5 +215,14 @@ "Great work in viewing and understanding the diff of a specific commit!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1769938189.993759, + "completed_at": 1769938192.713423, + "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 8cbdb55de5e438e888bb3337164f9d45b6872b45 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:30:32 +0800 Subject: [PATCH 04/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 2b88bd244..227dc03e2 100644 --- a/progress.json +++ b/progress.json @@ -224,5 +224,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1769938230.742799, + "completed_at": 1769938231.962199, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 948ec9e5a7376720d0978ec1b43de69ce6ef59d1 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:35:18 +0800 Subject: [PATCH 05/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 227dc03e2..1f545556f 100644 --- a/progress.json +++ b/progress.json @@ -233,5 +233,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1769938516.323259, + "completed_at": 1769938517.565235, + "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 ff440828b576b5303208ba3c39200e7f441a0d7a Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:41:54 +0800 Subject: [PATCH 06/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1f545556f..7e89c9bc5 100644 --- a/progress.json +++ b/progress.json @@ -242,5 +242,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1769938911.507805, + "completed_at": 1769938912.726663, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 6061c7455410205c2af4e89a15909effa3493ab7 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:44:30 +0800 Subject: [PATCH 07/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7e89c9bc5..5df382b5c 100644 --- a/progress.json +++ b/progress.json @@ -251,5 +251,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1769939068.465855, + "completed_at": 1769939069.687335, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From 024b0d2c6772f2029c89843288dc0d351d7b4114 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:47:42 +0800 Subject: [PATCH 08/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5df382b5c..fcfe418ae 100644 --- a/progress.json +++ b/progress.json @@ -260,5 +260,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1769939260.435191, + "completed_at": 1769939261.670936, + "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 9274c20b6d73fe5887c8b284d02e0623456a45c7 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:51:51 +0800 Subject: [PATCH 09/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fcfe418ae..67bf7669c 100644 --- a/progress.json +++ b/progress.json @@ -269,5 +269,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1769939509.31625, + "completed_at": 1769939510.597506, + "comments": [ + "You have successfully undone the merge of branch 'others'." + ], + "status": "Completed" } ] \ No newline at end of file From 6ac4a608a722b5535a535a872be05c95fa1170f1 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:53:56 +0800 Subject: [PATCH 10/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 67bf7669c..dd386610a 100644 --- a/progress.json +++ b/progress.json @@ -278,5 +278,14 @@ "You have successfully undone the merge of branch 'others'." ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1769939634.120481, + "completed_at": 1769939635.362311, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From 9f190458be83265460dc6c2cd96057a9c6870b92 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 17:55:41 +0800 Subject: [PATCH 11/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index dd386610a..8cebf1b3c 100644 --- a/progress.json +++ b/progress.json @@ -287,5 +287,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "merge-squash", + "started_at": 1769939739.590307, + "completed_at": 1769939740.86711, + "comments": [ + "Good job performing a merge squash!" + ], + "status": "Completed" } ] \ No newline at end of file From d21a969f24c29b689e686565eb0c3289b0a376f6 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 18:00:58 +0800 Subject: [PATCH 12/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8cebf1b3c..78644b1d3 100644 --- a/progress.json +++ b/progress.json @@ -296,5 +296,14 @@ "Good job performing a merge squash!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1769940056.078562, + "completed_at": 1769940057.285804, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 3844fa8b964176b5364c1ee9d445e5ccc7285c48 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 18:02:56 +0800 Subject: [PATCH 13/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 78644b1d3..8664c2b64 100644 --- a/progress.json +++ b/progress.json @@ -305,5 +305,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1769940174.390733, + "completed_at": 1769940175.612357, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 7fe09b0cb3ed8e08324628f74236a0ec21ae761e Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 18:05:09 +0800 Subject: [PATCH 14/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8664c2b64..535e163f1 100644 --- a/progress.json +++ b/progress.json @@ -314,5 +314,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1769940307.122471, + "completed_at": 1769940308.326404, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file From fea2795ce91f463ed336b49cf9aad94ac9d44342 Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 18:10:02 +0800 Subject: [PATCH 15/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 535e163f1..ab8d95646 100644 --- a/progress.json +++ b/progress.json @@ -323,5 +323,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1769940599.940278, + "completed_at": 1769940601.169568, + "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 ff786515efec6f3c269240f997c99b3b0ac063bd Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 18:13:52 +0800 Subject: [PATCH 16/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ab8d95646..5ab41984a 100644 --- a/progress.json +++ b/progress.json @@ -332,5 +332,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": 1769940829.064411, + "completed_at": 1769940831.841866, + "comments": [ + "Expected commit message of 'Add the delete feature', got 'Add the delete feature\n\ncommit b82a60f0676891c02b72db3be26b42013446e306\nAuthor: damithc <1673303+damithc@users.noreply.github.com>\nDate: Fri Sep 26 23:37:32 2025 +0800\n\n Add missing period\n\ncommit bb28e06601a161ad15b4052f39d0b6e6d9bfbaf5\nAuthor: damithc <1673303+damithc@users.noreply.github.com>\nDate: Fri Sep 26 23:36:43 2025 +0800\n\n Mention feature for deleting books' instead." + ], + "status": "Incomplete" } ] \ No newline at end of file From df21b65fe067996c5d932a534c091c49fe2c802d Mon Sep 17 00:00:00 2001 From: RS <69071162+Arrus218@users.noreply.github.com> Date: Sun, 1 Feb 2026 18:14:27 +0800 Subject: [PATCH 17/17] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5ab41984a..e53eb1ee9 100644 --- a/progress.json +++ b/progress.json @@ -341,5 +341,14 @@ "Expected commit message of 'Add the delete feature', got 'Add the delete feature\n\ncommit b82a60f0676891c02b72db3be26b42013446e306\nAuthor: damithc <1673303+damithc@users.noreply.github.com>\nDate: Fri Sep 26 23:37:32 2025 +0800\n\n Add missing period\n\ncommit bb28e06601a161ad15b4052f39d0b6e6d9bfbaf5\nAuthor: damithc <1673303+damithc@users.noreply.github.com>\nDate: Fri Sep 26 23:36:43 2025 +0800\n\n Mention feature for deleting books' instead." ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1769940865.524456, + "completed_at": 1769940867.37643, + "comments": [ + "You have successfully completed the exercise!" + ], + "status": "Completed" } ] \ No newline at end of file