From 4b6f058dfced810246072c1c68be7b8c0a79dd36 Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 16:48:08 +0800 Subject: [PATCH 01/16] Sync progress with local machine --- progress.json | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..3e8a7304f --- /dev/null +++ b/progress.json @@ -0,0 +1,65 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1756502045.413708, + "completed_at": 1756502047.023545, + "comments": [ + "There are no new grocery list items added to the shopping list." + ], + "status": "Incomplete" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1756502097.103797, + "completed_at": 1756502097.50158, + "comments": [ + "There are no new grocery list items added to the shopping list." + ], + "status": "Incomplete" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1756502134.401419, + "completed_at": 1756502134.510814, + "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": 1756487686.816189, + "completed_at": 1756487687.259569, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "staging-intervention", + "started_at": 1756494711.586111, + "completed_at": 1756494712.012494, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1756477963.009282, + "completed_at": 1756477963.41523, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1756478014.104349, + "completed_at": 1756478014.613957, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + } +] \ No newline at end of file From 183567ad857bd3e6080d2d8898ce7d58ab2333cd Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 16:53:30 +0800 Subject: [PATCH 02/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3e8a7304f..a35a32cb5 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "You successfully used git init to initialize this folder as a Git repository!" ], "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1756543801.734064, + "completed_at": 1756544009.919832, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 5cb0228f777479900646a710b7123dfb12555a99 Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 17:15:55 +0800 Subject: [PATCH 03/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a35a32cb5..850aca451 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1756545354.839279, + "completed_at": 1756545355.308837, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 077bd6c4411b272ee4e55fa1b5ad57a4e686c169 Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 18:10:43 +0800 Subject: [PATCH 04/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 850aca451..c866f0115 100644 --- a/progress.json +++ b/progress.json @@ -79,5 +79,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1756548639.650655, + "completed_at": 1756548643.039708, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From b78533b5d32bf0a373fdea1f473d73546738e999 Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 18:48:38 +0800 Subject: [PATCH 05/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c866f0115..4c1b9e4e5 100644 --- a/progress.json +++ b/progress.json @@ -88,5 +88,14 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1756550917.553688, + "completed_at": 1756550918.350122, + "comments": [ + "You are not ignoring runaway.txt. Find where the file is and fix that." + ], + "status": "Incomplete" } ] \ No newline at end of file From 2c8612a627a7a20debd6e9389a539b33a31b84c5 Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 18:52:31 +0800 Subject: [PATCH 06/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4c1b9e4e5..99a9f485b 100644 --- a/progress.json +++ b/progress.json @@ -97,5 +97,14 @@ "You are not ignoring runaway.txt. Find where the file is and fix that." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1756551149.977306, + "completed_at": 1756551150.8207, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" } ] \ No newline at end of file From 314e50f4fab401cc28de0bc497409063a11c9764 Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 19:23:18 +0800 Subject: [PATCH 07/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 99a9f485b..6a4aecafc 100644 --- a/progress.json +++ b/progress.json @@ -106,5 +106,14 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1756552995.875201, + "completed_at": 1756552997.75113, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 38f60479dbf6c1372889e889814ecf49b9a633ab Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 20:24:18 +0800 Subject: [PATCH 08/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6a4aecafc..d976bc0cf 100644 --- a/progress.json +++ b/progress.json @@ -115,5 +115,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1756556655.674063, + "completed_at": 1756556657.629949, + "comments": [ + "The upstream remote does not point to the original repository!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 8d44b2c038b3e785b87c6bbff035cdafb4a2ab4e Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 20:26:02 +0800 Subject: [PATCH 09/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d976bc0cf..187366eac 100644 --- a/progress.json +++ b/progress.json @@ -124,5 +124,14 @@ "The upstream remote does not point to the original repository!" ], "status": "Incomplete" + }, + { + "exercise_name": "clone-repo", + "started_at": 1756556760.998404, + "completed_at": 1756556762.531721, + "comments": [ + "The upstream remote does not point to the original repository!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 081840677869a1b15e5c37f0d81f1202ed8f0dbd Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 20:27:17 +0800 Subject: [PATCH 10/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 187366eac..54f1496c4 100644 --- a/progress.json +++ b/progress.json @@ -133,5 +133,14 @@ "The upstream remote does not point to the original repository!" ], "status": "Incomplete" + }, + { + "exercise_name": "clone-repo", + "started_at": 1756556834.87543, + "completed_at": 1756556836.932329, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From c14155f539931b77866bb79cb59fae63cb43ac72 Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 30 Aug 2025 21:45:04 +0800 Subject: [PATCH 11/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 54f1496c4..56424e477 100644 --- a/progress.json +++ b/progress.json @@ -142,5 +142,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1756561503.505808, + "completed_at": 1756561503.950198, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From ae11507d6b3386ed2bf2760a006800d75421d5fc Mon Sep 17 00:00:00 2001 From: ivanng Date: Thu, 4 Sep 2025 18:57:32 +0800 Subject: [PATCH 12/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 56424e477..e521b2eac 100644 --- a/progress.json +++ b/progress.json @@ -151,5 +151,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1756983451.694183, + "completed_at": 1756983452.136412, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 9523b358f65feb17f67cde37661ffbcc0c528ccf Mon Sep 17 00:00:00 2001 From: ivanng Date: Fri, 5 Sep 2025 06:22:31 +0800 Subject: [PATCH 13/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e521b2eac..310b2b8b5 100644 --- a/progress.json +++ b/progress.json @@ -160,5 +160,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1757024550.411433, + "completed_at": 1757024550.796386, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 632f7c93f8a588992c204cce4500ce3837369166 Mon Sep 17 00:00:00 2001 From: ivanng Date: Fri, 5 Sep 2025 06:34:29 +0800 Subject: [PATCH 14/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 310b2b8b5..affea1d9b 100644 --- a/progress.json +++ b/progress.json @@ -169,5 +169,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1757025268.54136, + "completed_at": 1757025268.91329, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 082068d7739b247468328454046314e1a2d6da7d Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 6 Sep 2025 15:38:54 +0800 Subject: [PATCH 15/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index affea1d9b..cc1451461 100644 --- a/progress.json +++ b/progress.json @@ -178,5 +178,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1757144333.35803, + "completed_at": 1757144333.84152, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 2518127d4cfea33ca99fbc01d3ad0b7b641fd3f9 Mon Sep 17 00:00:00 2001 From: ivanng Date: Sat, 6 Sep 2025 16:08:12 +0800 Subject: [PATCH 16/16] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index cc1451461..77b5d73f3 100644 --- a/progress.json +++ b/progress.json @@ -187,5 +187,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1757146090.593545, + "completed_at": 1757146091.853648, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file