From c0365819b8f749ac3ebc7f5e9b1fe431c9ab970c Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 01:38:17 +0800 Subject: [PATCH 01/18] 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 00000000..b8353a9a --- /dev/null +++ b/progress.json @@ -0,0 +1,29 @@ +[ + { + "exercise_name": "staging-intervention", + "started_at": 1755657231.516785, + "completed_at": 1755657231.892217, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1755652668.04315, + "completed_at": 1755652668.045065, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1755652802.684479, + "completed_at": 1755652803.023766, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + } +] \ No newline at end of file From 58e2ed6f696d8aea717f77a02c22d1df37824845 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 01:42:15 +0800 Subject: [PATCH 02/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b8353a9a..430d9172 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": 1755798060.296237, + "completed_at": 1755798135.251109, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From b2dd24519cfa9323e077e59ff91cbc8362a4d21c Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 01:48:03 +0800 Subject: [PATCH 03/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 430d9172..631d390f 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": 1755798482.282287, + "completed_at": 1755798482.591852, + "comments": [ + "Missing remote called 'upstream'." + ], + "status": "Incomplete" } ] \ No newline at end of file From 1a546deca3f8b88fad56f048610b6306bdf1804f Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 01:51:46 +0800 Subject: [PATCH 04/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 631d390f..23b9a526 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "Missing remote called 'upstream'." ], "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1755798705.715063, + "completed_at": 1755798705.773541, + "comments": [ + "Wrong 'upstream' remote URL" + ], + "status": "Incomplete" } ] \ No newline at end of file From 18bd38098c141dcf50cb8c5ccfb6374dc405f664 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 01:52:34 +0800 Subject: [PATCH 05/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 23b9a526..9d85d798 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,14 @@ "Wrong 'upstream' remote URL" ], "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1755798753.937185, + "completed_at": 1755798754.365006, + "comments": [ + "Wrong 'upstream' remote URL" + ], + "status": "Incomplete" } ] \ No newline at end of file From 889676932e8cd046b25aaf681dda39746545bead Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 01:54:32 +0800 Subject: [PATCH 06/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9d85d798..f3a50ae7 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "Wrong 'upstream' remote URL" ], "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1755798872.227418, + "completed_at": 1755798872.283309, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 67dac49c459ec2f90f210711592db8767651d31a Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 02:00:43 +0800 Subject: [PATCH 07/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f3a50ae7..584c28d4 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1755799242.932897, + "completed_at": 1755799243.343062, + "comments": [ + "You should have made a separate commit!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 1124a640a3be5bdfd99098b7ebc0779c0d50f6e5 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 02:03:35 +0800 Subject: [PATCH 08/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 584c28d4..13cd9825 100644 --- a/progress.json +++ b/progress.json @@ -79,5 +79,14 @@ "You should have made a separate commit!" ], "status": "Incomplete" + }, + { + "exercise_name": "push-over", + "started_at": 1755799415.04885, + "completed_at": 1755799415.116734, + "comments": [ + "You should have made a separate commit!" + ], + "status": "Incomplete" } ] \ No newline at end of file From e9a1842181965ae0c00023bca4eb4eb2557699c9 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 02:06:06 +0800 Subject: [PATCH 09/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 13cd9825..554f1a0d 100644 --- a/progress.json +++ b/progress.json @@ -88,5 +88,14 @@ "You should have made a separate commit!" ], "status": "Incomplete" + }, + { + "exercise_name": "push-over", + "started_at": 1755799564.966941, + "completed_at": 1755799565.99689, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From f6f2ec533ad78fab7bde19ad255183dcc68e7242 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 11:14:58 +0800 Subject: [PATCH 10/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 554f1a0d..12fab58d 100644 --- a/progress.json +++ b/progress.json @@ -97,5 +97,14 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755832497.158652, + "completed_at": 1755832497.709531, + "comments": [ + "You have not made any commits yet!" + ], + "status": "Incomplete" } ] \ No newline at end of file From f84264d9ebfde89049c6d20e9d174a4fb4e6ed10 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 11:16:46 +0800 Subject: [PATCH 11/18] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 12fab58d..bbc6152f 100644 --- a/progress.json +++ b/progress.json @@ -106,5 +106,15 @@ "You have not made any commits yet!" ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755832605.52635, + "completed_at": 1755832606.37025, + "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 8474ff3d15dc068be62e80e49aef0fbcb2ae24c3 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 11:18:29 +0800 Subject: [PATCH 12/18] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index bbc6152f..d5450252 100644 --- a/progress.json +++ b/progress.json @@ -116,5 +116,15 @@ "You are not ignoring runaway.txt. Find where the file is and fix that." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755832708.83098, + "completed_at": 1755832709.321816, + "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 852ebed564d8730a157388a124a821878769ad00 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 11:19:10 +0800 Subject: [PATCH 13/18] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index d5450252..4774a963 100644 --- a/progress.json +++ b/progress.json @@ -126,5 +126,15 @@ "You are not ignoring runaway.txt. Find where the file is and fix that." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755832749.389084, + "completed_at": 1755832749.870589, + "comments": [ + "You should be ignoring the rest of many/* except many/file22.txt!", + "You should be using ** to match all subfolders to ignore runaway.txt." + ], + "status": "Incomplete" } ] \ No newline at end of file From 782204bf878f7b348ef965bd409e9cf202f00132 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 11:20:41 +0800 Subject: [PATCH 14/18] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 4774a963..d313a760 100644 --- a/progress.json +++ b/progress.json @@ -136,5 +136,15 @@ "You should be using ** to match all subfolders to ignore runaway.txt." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755832839.768099, + "completed_at": 1755832840.566859, + "comments": [ + "You should be ignoring the rest of many/* except many/file22.txt!", + "You should be using ** to match all subfolders to ignore runaway.txt." + ], + "status": "Incomplete" } ] \ No newline at end of file From f85b547fb8249ad85bc0c85eb4361d1a74eccc76 Mon Sep 17 00:00:00 2001 From: nickson Date: Fri, 22 Aug 2025 11:23:20 +0800 Subject: [PATCH 15/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d313a760..0d3200fe 100644 --- a/progress.json +++ b/progress.json @@ -146,5 +146,14 @@ "You should be using ** to match all subfolders to ignore runaway.txt." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755832999.239413, + "completed_at": 1755833000.003451, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" } ] \ No newline at end of file From 42852014f0a3070335bc814038c4b6fed4b2dfcf Mon Sep 17 00:00:00 2001 From: nickson Date: Thu, 28 Aug 2025 12:53:22 +0800 Subject: [PATCH 16/18] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 0d3200fe..0275ca1a 100644 --- a/progress.json +++ b/progress.json @@ -155,5 +155,15 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1756356801.683875, + "completed_at": 1756356802.023971, + "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 8a2c1c45f82a72ee5b39c700bbe815d6303e7a1d Mon Sep 17 00:00:00 2001 From: nickson Date: Thu, 28 Aug 2025 12:58:12 +0800 Subject: [PATCH 17/18] Reset progress for conflict-mediator --- progress.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/progress.json b/progress.json index 0275ca1a..0d3200fe 100644 --- a/progress.json +++ b/progress.json @@ -155,15 +155,5 @@ "Great work using .gitignore!" ], "status": "Completed" - }, - { - "exercise_name": "conflict-mediator", - "started_at": 1756356801.683875, - "completed_at": 1756356802.023971, - "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 40ebd229c870665763c090f9856e5f1c97be1e80 Mon Sep 17 00:00:00 2001 From: nickson Date: Thu, 28 Aug 2025 13:02:47 +0800 Subject: [PATCH 18/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0d3200fe..4da599d4 100644 --- a/progress.json +++ b/progress.json @@ -155,5 +155,14 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1756357366.119211, + "completed_at": 1756357366.517531, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file