From f81d23c7974d9fdccae676f8160e484eb3dc6c60 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 09:06:17 +0800 Subject: [PATCH 01/41] 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..81340043f --- /dev/null +++ b/progress.json @@ -0,0 +1,29 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1755097962.015809, + "completed_at": 1755097962.562087, + "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": 1755097401.226329, + "completed_at": 1755097401.705391, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1755095525.137629, + "completed_at": 1755095525.525681, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + } +] \ No newline at end of file From 33f2437048af401b4688c247e31a3d9560b7790a Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 09:09:31 +0800 Subject: [PATCH 02/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 81340043f..093b2290d 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": 1755133702.356684, + "completed_at": 1755133771.330436, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 93674858d18740019076a5a4a6124bab5319ecd0 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 09:23:16 +0800 Subject: [PATCH 03/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 093b2290d..e919f723c 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": 1755134595.292095, + "completed_at": 1755134595.678354, + "comments": [ + "too many values to unpack (expected 2)" + ], + "status": "Error" } ] \ No newline at end of file From 65cb6b6414c519e8af89286f7d27f72d7b5a8aab Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 09:23:50 +0800 Subject: [PATCH 04/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e919f723c..945cc5e44 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "too many values to unpack (expected 2)" ], "status": "Error" + }, + { + "exercise_name": "link-me", + "started_at": 1755134629.953114, + "completed_at": 1755134630.061584, + "comments": [ + "too many values to unpack (expected 2)" + ], + "status": "Error" } ] \ No newline at end of file From b31c3ec58f8fe98cd802d63a45d98c9d841d61e3 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 09:25:14 +0800 Subject: [PATCH 05/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 945cc5e44..c54d21c3a 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,14 @@ "too many values to unpack (expected 2)" ], "status": "Error" + }, + { + "exercise_name": "link-me", + "started_at": 1755134713.461368, + "completed_at": 1755134713.537267, + "comments": [ + "too many values to unpack (expected 2)" + ], + "status": "Error" } ] \ No newline at end of file From ffb02a65740e595ff1601b8fe5731a09182b702a Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:16:12 +0800 Subject: [PATCH 06/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c54d21c3a..50e4a225e 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "too many values to unpack (expected 2)" ], "status": "Error" + }, + { + "exercise_name": "link-me", + "started_at": 1755177371.644217, + "completed_at": 1755177372.058264, + "comments": [ + "too many values to unpack (expected 2)" + ], + "status": "Error" } ] \ No newline at end of file From a3021741023691addf5a0132325595a1800481fc Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:17:11 +0800 Subject: [PATCH 07/41] Reset progress for link-me --- progress.json | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/progress.json b/progress.json index 50e4a225e..093b2290d 100644 --- a/progress.json +++ b/progress.json @@ -34,41 +34,5 @@ "Great work setting up a public remote repository!" ], "status": "Completed" - }, - { - "exercise_name": "link-me", - "started_at": 1755134595.292095, - "completed_at": 1755134595.678354, - "comments": [ - "too many values to unpack (expected 2)" - ], - "status": "Error" - }, - { - "exercise_name": "link-me", - "started_at": 1755134629.953114, - "completed_at": 1755134630.061584, - "comments": [ - "too many values to unpack (expected 2)" - ], - "status": "Error" - }, - { - "exercise_name": "link-me", - "started_at": 1755134713.461368, - "completed_at": 1755134713.537267, - "comments": [ - "too many values to unpack (expected 2)" - ], - "status": "Error" - }, - { - "exercise_name": "link-me", - "started_at": 1755177371.644217, - "completed_at": 1755177372.058264, - "comments": [ - "too many values to unpack (expected 2)" - ], - "status": "Error" } ] \ No newline at end of file From eaa78a9a8e33d52bb818a58ee87d5907ca95f2a9 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:19:15 +0800 Subject: [PATCH 08/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 093b2290d..dc96499c9 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": 1755177554.499167, + "completed_at": 1755177554.570022, + "comments": [ + "Missing remote called 'upstream'." + ], + "status": "Incomplete" } ] \ No newline at end of file From 77a21c902f8a02f6d71f3e30572b836035cf7b89 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:20:19 +0800 Subject: [PATCH 09/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index dc96499c9..a4ae53c50 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "Missing remote called 'upstream'." ], "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1755177619.02186, + "completed_at": 1755177619.115584, + "comments": [ + "too many values to unpack (expected 2)" + ], + "status": "Error" } ] \ No newline at end of file From fcfb48a0463970d6a7049d74a9796a5bb3c6f24f Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:21:18 +0800 Subject: [PATCH 10/41] Reset progress for link-me --- progress.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/progress.json b/progress.json index a4ae53c50..093b2290d 100644 --- a/progress.json +++ b/progress.json @@ -34,23 +34,5 @@ "Great work setting up a public remote repository!" ], "status": "Completed" - }, - { - "exercise_name": "link-me", - "started_at": 1755177554.499167, - "completed_at": 1755177554.570022, - "comments": [ - "Missing remote called 'upstream'." - ], - "status": "Incomplete" - }, - { - "exercise_name": "link-me", - "started_at": 1755177619.02186, - "completed_at": 1755177619.115584, - "comments": [ - "too many values to unpack (expected 2)" - ], - "status": "Error" } ] \ No newline at end of file From babaeb3ee6fd30c8e451e914af322d64c2fa870a Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:23:53 +0800 Subject: [PATCH 11/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 093b2290d..0939e9bfe 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": 1755177832.716628, + "completed_at": 1755177833.150641, + "comments": [ + "too many values to unpack (expected 2)" + ], + "status": "Error" } ] \ No newline at end of file From 46eb6b07939015ce62012c1202d783a025a17e06 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:24:45 +0800 Subject: [PATCH 12/41] Reset progress for link-me --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index 0939e9bfe..093b2290d 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": 1755177832.716628, - "completed_at": 1755177833.150641, - "comments": [ - "too many values to unpack (expected 2)" - ], - "status": "Error" } ] \ No newline at end of file From b216e3becceef9a4a16e3886af0749439447c2d6 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:29:49 +0800 Subject: [PATCH 13/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 093b2290d..2de6f3467 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": 1755178188.37958, + "completed_at": 1755178188.788627, + "comments": [ + "Wrong 'upstream' remote URL" + ], + "status": "Incomplete" } ] \ No newline at end of file From a72179aa276b593978ebb3e6154c189a60023ac4 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 21:31:02 +0800 Subject: [PATCH 14/41] Reset progress for link-me --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index 2de6f3467..093b2290d 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": 1755178188.37958, - "completed_at": 1755178188.788627, - "comments": [ - "Wrong 'upstream' remote URL" - ], - "status": "Incomplete" } ] \ No newline at end of file From 6eaa65765a342fc0d318694398c4534b2324cfec Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 22:04:48 +0800 Subject: [PATCH 15/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 093b2290d..5f90ab7aa 100644 --- a/progress.json +++ b/progress.json @@ -34,5 +34,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1755180286.993021, + "completed_at": 1755180287.415919, + "comments": [ + "You should have made a separate commit!" + ], + "status": "Incomplete" } ] \ No newline at end of file From cc1a382a40e264c64fbdb60edb26d75a72d359e4 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 22:06:46 +0800 Subject: [PATCH 16/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5f90ab7aa..8d9859187 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "You should have made a separate commit!" ], "status": "Incomplete" + }, + { + "exercise_name": "push-over", + "started_at": 1755180405.095299, + "completed_at": 1755180405.865775, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 5323f0d105c5de8f067a76644f9e59d1e3eb2d65 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 22:32:48 +0800 Subject: [PATCH 17/41] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 8d9859187..81478c259 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,15 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755181965.894524, + "completed_at": 1755181968.055932, + "comments": [ + "You are still ignoring many/file22.txt.", + "You are not ignoring runaway.txt. Find where the file is and fix that." + ], + "status": "Incomplete" } ] \ No newline at end of file From 697ead6ca2817e17fa5fecf355f4a2b9b257246c Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 22:38:48 +0800 Subject: [PATCH 18/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 81478c259..76c2f087e 100644 --- a/progress.json +++ b/progress.json @@ -62,5 +62,14 @@ "You are not ignoring runaway.txt. Find where the file is and fix that." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755182325.755852, + "completed_at": 1755182327.758393, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" } ] \ No newline at end of file From 0f934dedd02ba5ae807c482c92246b7b14eab955 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 22:45:16 +0800 Subject: [PATCH 19/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 76c2f087e..d4af42e6b 100644 --- a/progress.json +++ b/progress.json @@ -71,5 +71,14 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1755182714.168344, + "completed_at": 1755182716.096702, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From aac7aa740dd1a55ec18baa3705578b9f48987c6c Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 23:08:44 +0800 Subject: [PATCH 20/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d4af42e6b..f6ba38437 100644 --- a/progress.json +++ b/progress.json @@ -80,5 +80,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755184121.263975, + "completed_at": 1755184123.425039, + "comments": [ + "The remote 'origin' is missing!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 2ad2d0f97831d0a122759d56be8033e41b5800df Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 23:10:27 +0800 Subject: [PATCH 21/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f6ba38437..1b6868676 100644 --- a/progress.json +++ b/progress.json @@ -89,5 +89,14 @@ "The remote 'origin' is missing!" ], "status": "Incomplete" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755184225.118669, + "completed_at": 1755184226.965382, + "comments": [ + "The remote 'origin' is missing!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 16b9242f966a6c090678ac3b10b42538882a2ede Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 23:11:08 +0800 Subject: [PATCH 22/41] Reset progress for clone-repo --- progress.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/progress.json b/progress.json index 1b6868676..d4af42e6b 100644 --- a/progress.json +++ b/progress.json @@ -80,23 +80,5 @@ "Great work creating a fork with Github!" ], "status": "Completed" - }, - { - "exercise_name": "clone-repo", - "started_at": 1755184121.263975, - "completed_at": 1755184123.425039, - "comments": [ - "The remote 'origin' is missing!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "clone-repo", - "started_at": 1755184225.118669, - "completed_at": 1755184226.965382, - "comments": [ - "The remote 'origin' is missing!" - ], - "status": "Incomplete" } ] \ No newline at end of file From 3fdaff6dcf085caec15d9b8c0209f567e9376ddc Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 23:17:50 +0800 Subject: [PATCH 23/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d4af42e6b..b1c8e3b36 100644 --- a/progress.json +++ b/progress.json @@ -80,5 +80,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755184667.807145, + "completed_at": 1755184669.591433, + "comments": [ + "The remote 'origin' is missing!" + ], + "status": "Incomplete" } ] \ No newline at end of file From c51c8c40d33830425347a195158ccb38a89e0673 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 23:28:32 +0800 Subject: [PATCH 24/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b1c8e3b36..5c37540d5 100644 --- a/progress.json +++ b/progress.json @@ -89,5 +89,14 @@ "The remote 'origin' is missing!" ], "status": "Incomplete" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755185309.656134, + "completed_at": 1755185311.707329, + "comments": [ + "The remote 'origin' is missing!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 14b5b58bdaac4fbdd43130a8de58c94b3e28555a Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 23:30:37 +0800 Subject: [PATCH 25/41] Reset progress for clone-repo --- progress.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/progress.json b/progress.json index 5c37540d5..d4af42e6b 100644 --- a/progress.json +++ b/progress.json @@ -80,23 +80,5 @@ "Great work creating a fork with Github!" ], "status": "Completed" - }, - { - "exercise_name": "clone-repo", - "started_at": 1755184667.807145, - "completed_at": 1755184669.591433, - "comments": [ - "The remote 'origin' is missing!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "clone-repo", - "started_at": 1755185309.656134, - "completed_at": 1755185311.707329, - "comments": [ - "The remote 'origin' is missing!" - ], - "status": "Incomplete" } ] \ No newline at end of file From b0da0da58e72e54389544567777ae8df8cdbff98 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Thu, 14 Aug 2025 23:39:56 +0800 Subject: [PATCH 26/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d4af42e6b..9a9a1ca6d 100644 --- a/progress.json +++ b/progress.json @@ -80,5 +80,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755185994.049389, + "completed_at": 1755185995.989908, + "comments": [ + "The remote 'origin' is missing!" + ], + "status": "Incomplete" } ] \ No newline at end of file From df032507324ebf4d7cae2c202c87c8a951666d77 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Fri, 15 Aug 2025 00:44:37 +0800 Subject: [PATCH 27/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9a9a1ca6d..619b3681d 100644 --- a/progress.json +++ b/progress.json @@ -89,5 +89,14 @@ "The remote 'origin' is missing!" ], "status": "Incomplete" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755189874.528896, + "completed_at": 1755189876.49914, + "comments": [ + "The origin remote does not point to your fork!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 6cc019a99b824b5d7fb48e6e7eaa6489bff48e50 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Fri, 15 Aug 2025 00:45:30 +0800 Subject: [PATCH 28/41] Reset progress for clone-repo --- progress.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/progress.json b/progress.json index 619b3681d..d4af42e6b 100644 --- a/progress.json +++ b/progress.json @@ -80,23 +80,5 @@ "Great work creating a fork with Github!" ], "status": "Completed" - }, - { - "exercise_name": "clone-repo", - "started_at": 1755185994.049389, - "completed_at": 1755185995.989908, - "comments": [ - "The remote 'origin' is missing!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "clone-repo", - "started_at": 1755189874.528896, - "completed_at": 1755189876.49914, - "comments": [ - "The origin remote does not point to your fork!" - ], - "status": "Incomplete" } ] \ No newline at end of file From f3239721f357dd2875adacefd10be290a95723c6 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Fri, 15 Aug 2025 00:47:34 +0800 Subject: [PATCH 29/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d4af42e6b..74d6fcd2c 100644 --- a/progress.json +++ b/progress.json @@ -80,5 +80,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755190052.73717, + "completed_at": 1755190054.379175, + "comments": [ + "The origin remote does not point to your fork!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 0257ec8945ad94e4d6d4eb1d926ff2838f80c968 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Fri, 15 Aug 2025 15:22:33 +0800 Subject: [PATCH 30/41] Reset progress for clone-repo --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index 74d6fcd2c..d4af42e6b 100644 --- a/progress.json +++ b/progress.json @@ -80,14 +80,5 @@ "Great work creating a fork with Github!" ], "status": "Completed" - }, - { - "exercise_name": "clone-repo", - "started_at": 1755190052.73717, - "completed_at": 1755190054.379175, - "comments": [ - "The origin remote does not point to your fork!" - ], - "status": "Incomplete" } ] \ No newline at end of file From 68e070e926b1b3723b4d6ea7d5a438186c70275e Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Fri, 15 Aug 2025 15:28:04 +0800 Subject: [PATCH 31/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d4af42e6b..0cc2eaf76 100644 --- a/progress.json +++ b/progress.json @@ -80,5 +80,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755242882.252214, + "completed_at": 1755242884.220245, + "comments": [ + "The origin remote does not point to your fork!" + ], + "status": "Incomplete" } ] \ No newline at end of file From bed3ecbec15a6507a466a6d92cb0a9326928ccfa Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Fri, 15 Aug 2025 15:30:36 +0800 Subject: [PATCH 32/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0cc2eaf76..6daffc01b 100644 --- a/progress.json +++ b/progress.json @@ -89,5 +89,14 @@ "The origin remote does not point to your fork!" ], "status": "Incomplete" + }, + { + "exercise_name": "fork-repo", + "started_at": 1755243033.859897, + "completed_at": 1755243035.942181, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 1d212d0a634a7542689955c13b6854c6ff32eff0 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Fri, 15 Aug 2025 16:19:48 +0800 Subject: [PATCH 33/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6daffc01b..78201551f 100644 --- a/progress.json +++ b/progress.json @@ -98,5 +98,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1755245987.808756, + "completed_at": 1755245988.229649, + "comments": [ + "You did not pull Alice's changes to your own main branch!" + ], + "status": "Incomplete" } ] \ No newline at end of file From ff7098bf304280e17ecdb8744027307c9add181b Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Fri, 15 Aug 2025 16:24:52 +0800 Subject: [PATCH 34/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 78201551f..927330cf8 100644 --- a/progress.json +++ b/progress.json @@ -107,5 +107,14 @@ "You did not pull Alice's changes to your own main branch!" ], "status": "Incomplete" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1755246291.310228, + "completed_at": 1755246291.709004, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From de31dbe68b9b506df7be163f0306b09add33d5b8 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Wed, 20 Aug 2025 21:54:50 +0800 Subject: [PATCH 35/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 927330cf8..6fce295fc 100644 --- a/progress.json +++ b/progress.json @@ -116,5 +116,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1755698089.443527, + "completed_at": 1755698089.922228, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 69e60ab3151ee870667ad400ea1d6e3234d59986 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Wed, 20 Aug 2025 22:23:52 +0800 Subject: [PATCH 36/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6fce295fc..3247a68f2 100644 --- a/progress.json +++ b/progress.json @@ -125,5 +125,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1755699830.431534, + "completed_at": 1755699830.939782, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 7ce2afd2b23d850f3b4c1972320b870138b40a30 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Wed, 20 Aug 2025 22:28:36 +0800 Subject: [PATCH 37/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3247a68f2..2aed545f6 100644 --- a/progress.json +++ b/progress.json @@ -134,5 +134,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1755700116.002972, + "completed_at": 1755700116.39299, + "comments": [ + "You still have uncommitted changes. Commit them first on the appropriate branch first!" + ], + "status": "Incomplete" } ] \ No newline at end of file From b264a91ec93f48223c2d556e3172ed2e3500ac7d Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Wed, 20 Aug 2025 22:29:21 +0800 Subject: [PATCH 38/41] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 2aed545f6..864a041ae 100644 --- a/progress.json +++ b/progress.json @@ -143,5 +143,15 @@ "You still have uncommitted changes. Commit them first on the appropriate branch first!" ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1755700160.448891, + "completed_at": 1755700160.570682, + "comments": [ + "You should resolve the merge by setting the print to be 'Hello Everyone and World!'", + "Reset the repository using \"gitmastery progress reset\" and start again" + ], + "status": "Incomplete" } ] \ No newline at end of file From f39b57769b0cf208fbf545d206eaa04a0501b1c1 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Wed, 20 Aug 2025 22:31:29 +0800 Subject: [PATCH 39/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 864a041ae..70610bcdd 100644 --- a/progress.json +++ b/progress.json @@ -153,5 +153,14 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1755700288.889307, + "completed_at": 1755700289.012284, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From b3d8621feec3c3e430ceab973ea7a6590af6873e Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Wed, 20 Aug 2025 22:37:09 +0800 Subject: [PATCH 40/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 70610bcdd..1f6862b11 100644 --- a/progress.json +++ b/progress.json @@ -162,5 +162,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1755700628.524282, + "completed_at": 1755700629.041989, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From b201fc07aa51c2bb674e6d8741a758427a398b92 Mon Sep 17 00:00:00 2001 From: tkaixinn Date: Wed, 20 Aug 2025 22:48:07 +0800 Subject: [PATCH 41/41] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1f6862b11..adf43421d 100644 --- a/progress.json +++ b/progress.json @@ -171,5 +171,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1755701285.633136, + "completed_at": 1755701286.138698, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file