From 6a54752b6c2bca072dcf0d0943c2da053abab496 Mon Sep 17 00:00:00 2001 From: neet-it Date: Mon, 25 Aug 2025 14:20:23 +0800 Subject: [PATCH 01/24] Sync progress with local machine --- progress.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..7ddba5635 --- /dev/null +++ b/progress.json @@ -0,0 +1,29 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1756098516.32028, + "completed_at": 1756098516.770068, + "comments": [ + "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!" + ], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1756097520.586345, + "completed_at": 1756097521.019538, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1756096094.253546, + "completed_at": 1756096094.715847, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + } +] \ No newline at end of file From 1170d3b62fcb0801a91ea291d07c0bbe4694160d Mon Sep 17 00:00:00 2001 From: neet-it Date: Mon, 25 Aug 2025 20:55:38 +0800 Subject: [PATCH 02/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7ddba5635..4cbefd402 100644 --- a/progress.json +++ b/progress.json @@ -25,5 +25,14 @@ "You successfully used git init to initialize this folder as a Git repository!" ], "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1756126322.944419, + "completed_at": 1756126536.278619, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From fba465af1b1266bf0dd67a335be39768d46a7643 Mon Sep 17 00:00:00 2001 From: neet-it Date: Mon, 25 Aug 2025 21:14:40 +0800 Subject: [PATCH 03/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4cbefd402..487bd2da1 100644 --- a/progress.json +++ b/progress.json @@ -34,5 +34,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1756127678.539522, + "completed_at": 1756127679.979604, + "comments": [ + "Wrong 'upstream' remote URL" + ], + "status": "Incomplete" } ] \ No newline at end of file From 893525e7da0b150a372e0b0e697a09ebb03b552b Mon Sep 17 00:00:00 2001 From: neet-it Date: Mon, 25 Aug 2025 21:18:40 +0800 Subject: [PATCH 04/24] Reset progress for link-me --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index 487bd2da1..4cbefd402 100644 --- a/progress.json +++ b/progress.json @@ -34,14 +34,5 @@ "Great work setting up a public remote repository!" ], "status": "Completed" - }, - { - "exercise_name": "link-me", - "started_at": 1756127678.539522, - "completed_at": 1756127679.979604, - "comments": [ - "Wrong 'upstream' remote URL" - ], - "status": "Incomplete" } ] \ No newline at end of file From 532c8cc094bb36b1ad5508a8ff6c2d963f0bf841 Mon Sep 17 00:00:00 2001 From: neet-it Date: Mon, 25 Aug 2025 21:19:49 +0800 Subject: [PATCH 05/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4cbefd402..e5343f85b 100644 --- a/progress.json +++ b/progress.json @@ -34,5 +34,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1756127988.200457, + "completed_at": 1756127988.614491, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 251c40468cf0e9e8016fb437552a5dcd3ff0d8cf Mon Sep 17 00:00:00 2001 From: neet-it Date: Mon, 25 Aug 2025 21:50:22 +0800 Subject: [PATCH 06/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e5343f85b..94d162306 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1756129817.910893, + "completed_at": 1756129822.241894, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From cb5f4bb57ffd00c1646d7c379f3c5a0822ad0bea Mon Sep 17 00:00:00 2001 From: neet-it Date: Mon, 25 Aug 2025 22:29:31 +0800 Subject: [PATCH 07/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 94d162306..022de58c2 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,14 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1756132169.530741, + "completed_at": 1756132170.469059, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" } ] \ No newline at end of file From 25139c5338a0945e735b66ba1d69881088bdd178 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 09:11:55 +0800 Subject: [PATCH 08/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 022de58c2..fea2bba8b 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1756170712.57535, + "completed_at": 1756170715.123812, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From a4d814be75901c720d2d2dc434a6053874908e20 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 09:50:57 +0800 Subject: [PATCH 09/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fea2bba8b..db711fd83 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1756173054.839566, + "completed_at": 1756173057.063389, + "comments": [ + "The remote 'origin' is missing!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 4b1385da46c84be0e0a3e2342fcf966a95d60a99 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 09:54:23 +0800 Subject: [PATCH 10/24] Reset progress for clone-repo --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index db711fd83..fea2bba8b 100644 --- a/progress.json +++ b/progress.json @@ -70,14 +70,5 @@ "Great work creating a fork with Github!" ], "status": "Completed" - }, - { - "exercise_name": "clone-repo", - "started_at": 1756173054.839566, - "completed_at": 1756173057.063389, - "comments": [ - "The remote 'origin' is missing!" - ], - "status": "Incomplete" } ] \ No newline at end of file From ef27903339ebdac585739eb4635a33ed61c58a61 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 11:25:28 +0800 Subject: [PATCH 11/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fea2bba8b..e9760b9b8 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1756178725.838176, + "completed_at": 1756178727.847038, + "comments": [ + "The upstream remote does not point to the original repository!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 3005bc9ddffa80819fd79f65bb887ef35dc0a130 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 11:28:04 +0800 Subject: [PATCH 12/24] Reset progress for clone-repo --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index e9760b9b8..fea2bba8b 100644 --- a/progress.json +++ b/progress.json @@ -70,14 +70,5 @@ "Great work creating a fork with Github!" ], "status": "Completed" - }, - { - "exercise_name": "clone-repo", - "started_at": 1756178725.838176, - "completed_at": 1756178727.847038, - "comments": [ - "The upstream remote does not point to the original repository!" - ], - "status": "Incomplete" } ] \ No newline at end of file From b05268e8e4ad521a305af3920bc6cff3b0fc3644 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 19:16:40 +0800 Subject: [PATCH 13/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fea2bba8b..073ff3ffd 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1756206997.866204, + "completed_at": 1756207000.02245, + "comments": [ + "The upstream remote does not point to the original repository!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 6b72110cbf39e6c381bc3cc8ebe7b837b4edcc6a Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 19:18:56 +0800 Subject: [PATCH 14/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 073ff3ffd..33d71d25d 100644 --- a/progress.json +++ b/progress.json @@ -79,5 +79,14 @@ "The upstream remote does not point to the original repository!" ], "status": "Incomplete" + }, + { + "exercise_name": "clone-repo", + "started_at": 1756207132.669752, + "completed_at": 1756207135.702851, + "comments": [ + "The remote 'upstream' is missing!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 78c4f75989213ef162cf3a168a004bd5f6ce97e3 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 19:19:29 +0800 Subject: [PATCH 15/24] Reset progress for clone-repo --- progress.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/progress.json b/progress.json index 33d71d25d..fea2bba8b 100644 --- a/progress.json +++ b/progress.json @@ -70,23 +70,5 @@ "Great work creating a fork with Github!" ], "status": "Completed" - }, - { - "exercise_name": "clone-repo", - "started_at": 1756206997.866204, - "completed_at": 1756207000.02245, - "comments": [ - "The upstream remote does not point to the original repository!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "clone-repo", - "started_at": 1756207132.669752, - "completed_at": 1756207135.702851, - "comments": [ - "The remote 'upstream' is missing!" - ], - "status": "Incomplete" } ] \ No newline at end of file From 72aba465d86fd9ef14db5800fc15acc5956fcf3f Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 19:22:44 +0800 Subject: [PATCH 16/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fea2bba8b..51aa67787 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1756207361.694068, + "completed_at": 1756207363.851745, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From b102456b6d11ea12742f069a026b16a94952c3db Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 26 Aug 2025 19:48:49 +0800 Subject: [PATCH 17/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 51aa67787..0a3058b1e 100644 --- a/progress.json +++ b/progress.json @@ -79,5 +79,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1756208928.226155, + "completed_at": 1756208928.640204, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From d793316b9e9c578f87d3a95408392e1aa767aecd Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 2 Sep 2025 13:30:19 +0800 Subject: [PATCH 18/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0a3058b1e..84f1ac737 100644 --- a/progress.json +++ b/progress.json @@ -88,5 +88,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1756791018.574552, + "completed_at": 1756791018.997157, + "comments": [ + "You do not have 2 commits on the bug-fix branch" + ], + "status": "Incomplete" } ] \ No newline at end of file From 8a00a93769b390fa591c51615b69bc2ee2af5345 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 2 Sep 2025 13:39:15 +0800 Subject: [PATCH 19/24] Reset progress for side-track --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index 84f1ac737..0a3058b1e 100644 --- a/progress.json +++ b/progress.json @@ -88,14 +88,5 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" - }, - { - "exercise_name": "side-track", - "started_at": 1756791018.574552, - "completed_at": 1756791018.997157, - "comments": [ - "You do not have 2 commits on the bug-fix branch" - ], - "status": "Incomplete" } ] \ No newline at end of file From 3d77e73074bbaeb9e68afe76a16cfc6d54126b8b Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 2 Sep 2025 13:44:39 +0800 Subject: [PATCH 20/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0a3058b1e..0717d03a0 100644 --- a/progress.json +++ b/progress.json @@ -88,5 +88,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1756791876.644987, + "completed_at": 1756791877.107946, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 49e98187704b88b3ef97fc4c07774c0d62df19ca Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 2 Sep 2025 19:00:26 +0800 Subject: [PATCH 21/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0717d03a0..49b23169c 100644 --- a/progress.json +++ b/progress.json @@ -97,5 +97,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756810825.409812, + "completed_at": 1756810825.866549, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 107ca7920edbc77a26b5f8807ba7f120eb567d08 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 2 Sep 2025 19:10:08 +0800 Subject: [PATCH 22/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 49b23169c..ac5d4c21c 100644 --- a/progress.json +++ b/progress.json @@ -106,5 +106,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1756811406.742322, + "completed_at": 1756811407.287798, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 7dbbb99702384673a5919927fe843ab2c1674cb8 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 2 Sep 2025 19:19:10 +0800 Subject: [PATCH 23/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ac5d4c21c..a2adea7a4 100644 --- a/progress.json +++ b/progress.json @@ -115,5 +115,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1756811949.76798, + "completed_at": 1756811950.185361, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 0373862672d3a8417ef58aeeab2de8bf77833f26 Mon Sep 17 00:00:00 2001 From: neet-it Date: Tue, 2 Sep 2025 19:25:07 +0800 Subject: [PATCH 24/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a2adea7a4..5dcde1231 100644 --- a/progress.json +++ b/progress.json @@ -124,5 +124,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1756812306.674855, + "completed_at": 1756812307.179301, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file