From 806c36bf1e49f8fbb906021ac65189c30138e2af Mon Sep 17 00:00:00 2001 From: goodguykf Date: Fri, 22 Aug 2025 08:11:05 +0800 Subject: [PATCH 01/18] Sync progress with local machine --- progress.json | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..e5740c610 --- /dev/null +++ b/progress.json @@ -0,0 +1,38 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1755756481.763991, + "completed_at": 1755756482.285778, + "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": 1755755899.667615, + "completed_at": 1755755900.213346, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "staging-intervention", + "started_at": 1755756169.191792, + "completed_at": 1755756170.32731, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1755755773.526264, + "completed_at": 1755755773.963541, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + } +] \ No newline at end of file From 21deae63f1074c3757f0822064b02990462401b1 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Fri, 22 Aug 2025 08:17:32 +0800 Subject: [PATCH 02/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e5740c610..02106b025 100644 --- a/progress.json +++ b/progress.json @@ -34,5 +34,14 @@ "You successfully used git init to initialize this folder as a Git repository!" ], "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1755821801.034349, + "completed_at": 1755821851.529526, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From dfb7084065c684e5ddd68e8e7b07a0a8bc647a84 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Fri, 22 Aug 2025 09:25:37 +0800 Subject: [PATCH 03/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 02106b025..dfa5f5c79 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1755825935.508995, + "completed_at": 1755825937.398694, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 6a96d909d3dfaab5d2b2b63e78582d600e1f427f Mon Sep 17 00:00:00 2001 From: goodguykf Date: Fri, 22 Aug 2025 10:26:47 +0800 Subject: [PATCH 04/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index dfa5f5c79..c3ddab1e0 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755829604.83264, + "completed_at": 1755829606.884489, + "comments": [ + "The remote 'upstream' is missing!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 29f1719440ce614853908159c141e4c3d7271292 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Fri, 22 Aug 2025 10:28:23 +0800 Subject: [PATCH 05/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c3ddab1e0..426646ec5 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "The remote 'upstream' is missing!" ], "status": "Incomplete" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755829701.500301, + "completed_at": 1755829703.550454, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 09b665148b5bc4c5a9723494c1a00f37415b5954 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Fri, 22 Aug 2025 13:17:43 +0800 Subject: [PATCH 06/18] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 426646ec5..f8eea2d99 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,15 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1755839862.974701, + "completed_at": 1755839863.357016, + "comments": [ + "You should not have pulled Bob's changes to your own main branch!", + "Reset the exercise using 'gitmastery progress reset' to try again!" + ], + "status": "Incomplete" } ] \ No newline at end of file From e3f25cd4fa6b2db706b62d90881d51a9d0ce01a2 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Fri, 22 Aug 2025 13:19:59 +0800 Subject: [PATCH 07/18] Reset progress for fetch-and-pull --- progress.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/progress.json b/progress.json index f8eea2d99..426646ec5 100644 --- a/progress.json +++ b/progress.json @@ -70,15 +70,5 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" - }, - { - "exercise_name": "fetch-and-pull", - "started_at": 1755839862.974701, - "completed_at": 1755839863.357016, - "comments": [ - "You should not have pulled Bob's changes to your own main branch!", - "Reset the exercise using 'gitmastery progress reset' to try again!" - ], - "status": "Incomplete" } ] \ No newline at end of file From 054f8f7c07488a1fe617bbb2bf883280d24a3ee2 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Fri, 22 Aug 2025 13:23:20 +0800 Subject: [PATCH 08/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 426646ec5..35a1ab0d8 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1755840199.787683, + "completed_at": 1755840200.133113, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From 07fcf7797b8c90e4828b3058026e13530eb03514 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 15:20:33 +0800 Subject: [PATCH 09/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 35a1ab0d8..7c86e2da7 100644 --- a/progress.json +++ b/progress.json @@ -79,5 +79,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1756365631.62307, + "completed_at": 1756365632.019666, + "comments": [ + "You are missing the bug-fix branch" + ], + "status": "Incomplete" } ] \ No newline at end of file From 03c5fd556c6eb889ed697e8f2fb8c5d0402a28c8 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 15:23:11 +0800 Subject: [PATCH 10/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7c86e2da7..56068a998 100644 --- a/progress.json +++ b/progress.json @@ -88,5 +88,14 @@ "You are missing the bug-fix branch" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1756365790.074811, + "completed_at": 1756365790.609973, + "comments": [ + "You are missing the bug-fix branch" + ], + "status": "Incomplete" } ] \ No newline at end of file From 1e85fb878e46415a289e62a289922d017633aef2 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 15:25:48 +0800 Subject: [PATCH 11/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 56068a998..804276d39 100644 --- a/progress.json +++ b/progress.json @@ -97,5 +97,14 @@ "You are missing the bug-fix branch" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1756365947.301268, + "completed_at": 1756365947.647603, + "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 28b8d32d3c98f3c2dbe884e340e8888d11d6dcb0 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 15:26:22 +0800 Subject: [PATCH 12/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 804276d39..fb26aeab0 100644 --- a/progress.json +++ b/progress.json @@ -106,5 +106,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1756365981.464304, + "completed_at": 1756365981.59847, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 50fc43c7e13a151ad74356889c14a57987a48a9c Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 15:59:11 +0800 Subject: [PATCH 13/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fb26aeab0..da6940d4b 100644 --- a/progress.json +++ b/progress.json @@ -115,5 +115,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756367950.409976, + "completed_at": 1756367950.750951, + "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 2ceeaf56f8d50af7fc39caa8aeecb16475eb5ec3 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 16:03:33 +0800 Subject: [PATCH 14/18] Reset progress for branch-bender --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index da6940d4b..fb26aeab0 100644 --- a/progress.json +++ b/progress.json @@ -115,14 +115,5 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" - }, - { - "exercise_name": "branch-bender", - "started_at": 1756367950.409976, - "completed_at": 1756367950.750951, - "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 4b69a491d6b919539e747b151f65d8c063781e04 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 16:07:31 +0800 Subject: [PATCH 15/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fb26aeab0..34b88c5ac 100644 --- a/progress.json +++ b/progress.json @@ -115,5 +115,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756368450.583148, + "completed_at": 1756368450.936715, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From a3f59187f39467cebbe55a382678d812d108b899 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 16:44:11 +0800 Subject: [PATCH 16/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 34b88c5ac..d0b3603b1 100644 --- a/progress.json +++ b/progress.json @@ -124,5 +124,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1756370650.031385, + "completed_at": 1756370650.427699, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 63386ea83168cc957da7ceaf1b20ea522259dd2b Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 17:16:18 +0800 Subject: [PATCH 17/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d0b3603b1..781c1284d 100644 --- a/progress.json +++ b/progress.json @@ -133,5 +133,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1756372577.539889, + "completed_at": 1756372577.869911, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 3110911acea759a875c0b31b8bd6803a0b286bd2 Mon Sep 17 00:00:00 2001 From: goodguykf Date: Thu, 28 Aug 2025 22:03:00 +0800 Subject: [PATCH 18/18] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 781c1284d..33d2b7bd6 100644 --- a/progress.json +++ b/progress.json @@ -142,5 +142,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1756389779.782839, + "completed_at": 1756389780.139367, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file