From fb37c04eeeb697046b8a589e32b582719627c80c Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 29 Dec 2025 23:48:33 +0800 Subject: [PATCH 01/63] Sync progress with local machine --- progress.json | 241 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 241 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..c39a2680c --- /dev/null +++ b/progress.json @@ -0,0 +1,241 @@ +[ + { + "exercise_name": "sensors-diff", + "started_at": 1767009330.583291, + "completed_at": 1767009333.712653, + "comments": [ + "Answer for Which are the new values in modified but unstaged files? does not contain all of the right answers.", + "Answer for Which files have changed from Jan 09th to Jan 15th? does not contain all of the right answers." + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1767009373.970054, + "completed_at": 1767009377.12234, + "comments": [ + "Answer for Which files have changed from Jan 09th to Jan 15th? does not contain all of the right answers." + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1767009410.437961, + "completed_at": 1767009411.948016, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1767009585.365292, + "completed_at": 1767009586.728679, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1767009643.471483, + "completed_at": 1767009646.374132, + "comments": [ + "Answer for Which are the new values in staged files? is not right.", + "Answer for Which new values are new in north.csv on Jan 10th, compared to Jan 01st? is not right." + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1767009716.781984, + "completed_at": 1767009718.209846, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1767010087.840216, + "completed_at": 1767010090.947206, + "comments": [ + "It seems like the last two commits for Jan 14 and Jan 15 are still present in the commit history." + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1767010204.671495, + "completed_at": 1767010207.996183, + "comments": [ + "It seems like the commit from Jan 13 is still present in the commit history." + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1767010273.945717, + "completed_at": 1767010276.976586, + "comments": [ + "It seems like the commit from Jan 12 is still present in the commit history." + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1767010292.627185, + "completed_at": 1767010294.203271, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1767010342.58348, + "completed_at": 1767010345.926824, + "comments": [ + "You have not reverted all the commits yet!" + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1767010363.163684, + "completed_at": 1767010366.153743, + "comments": [ + "You have not reverted all the commits yet!" + ], + "status": "Incomplete" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1767010434.985654, + "completed_at": 1767010436.724847, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1767008088.070618, + "completed_at": 1767008091.255417, + "comments": [ + "Missing lightweight tag \"first-pilot\"." + ], + "status": "Incomplete" + }, + { + "exercise_name": "tags-add", + "started_at": 1767008104.526888, + "completed_at": 1767008107.660994, + "comments": [ + "\"first-pilot\" should point to the first commit." + ], + "status": "Incomplete" + }, + { + "exercise_name": "tags-add", + "started_at": 1767008152.917, + "completed_at": 1767008156.39274, + "comments": [ + "Missing annotated tag \"v1.0\"." + ], + "status": "Incomplete" + }, + { + "exercise_name": "tags-add", + "started_at": 1767008167.772011, + "completed_at": 1767008171.079059, + "comments": [ + "\"v1.0\" should point to the commit that updates March duty roster." + ], + "status": "Incomplete" + }, + { + "exercise_name": "tags-add", + "started_at": 1767008244.1078, + "completed_at": 1767008245.661135, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1767008494.329669, + "completed_at": 1767008498.226384, + "comments": [ + "Tag v1.0 is missing, did you push it to the remote?", + "Tag v2.0 is missing, did you push it to the remote?" + ], + "status": "Incomplete" + }, + { + "exercise_name": "tags-push", + "started_at": 1767008770.79591, + "completed_at": 1767008774.381966, + "comments": [ + "Tag v1.0 is missing, did you push it to the remote?", + "Tag v2.0 is missing, did you push it to the remote?" + ], + "status": "Incomplete" + }, + { + "exercise_name": "tags-push", + "started_at": 1767008863.242146, + "completed_at": 1767008867.075505, + "comments": [ + "Tag v1.0 is missing, did you push it to the remote?", + "Tag v2.0 is missing, did you push it to the remote?" + ], + "status": "Incomplete" + }, + { + "exercise_name": "tags-update", + "started_at": 1767008345.85877, + "completed_at": 1767008350.3807, + "comments": [ + "The 'april-update' tag is pointing to the wrong commit. It should point to the April commit." + ], + "status": "Incomplete" + }, + { + "exercise_name": "tags-update", + "started_at": 1767008378.833312, + "completed_at": 1767008380.220747, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1766976830.55981, + "completed_at": 1766976833.406901, + "comments": [ + "Missing question In April, what were the new names added to the duty rosters? Give the list of names as one line, separated by spaces. in answers file." + ], + "status": "Error" + }, + { + "exercise_name": "view-commits", + "started_at": 1766977249.99693, + "completed_at": 1766977251.358078, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1766977305.138733, + "completed_at": 1766977308.150871, + "comments": [ + "Invalid answers format: missing question(s) or answer(s) or both" + ], + "status": "Error" + } +] \ No newline at end of file From d2680f7e475a3976fbc8bf9abd31b49e9482c317 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Thu, 1 Jan 2026 12:21:36 +0800 Subject: [PATCH 02/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c39a2680c..984695745 100644 --- a/progress.json +++ b/progress.json @@ -237,5 +237,14 @@ "Invalid answers format: missing question(s) or answer(s) or both" ], "status": "Error" + }, + { + "exercise_name": "tags-push", + "started_at": 1767241291.762643, + "completed_at": 1767241295.995933, + "comments": [ + "Tag beta is still on the remote!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 18b7e3ea51105d0825e656530a07f3543e053311 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Thu, 1 Jan 2026 12:22:33 +0800 Subject: [PATCH 03/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 984695745..57e61e439 100644 --- a/progress.json +++ b/progress.json @@ -246,5 +246,14 @@ "Tag beta is still on the remote!" ], "status": "Incomplete" + }, + { + "exercise_name": "tags-push", + "started_at": 1767241349.860408, + "completed_at": 1767241352.481486, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" } ] \ No newline at end of file From 9aa6620f4c64e396f7f38f83e6e03ef23a170909 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sat, 3 Jan 2026 15:31:03 +0800 Subject: [PATCH 04/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 57e61e439..4952db107 100644 --- a/progress.json +++ b/progress.json @@ -255,5 +255,14 @@ "Wonderful! You have successfully synced the local tags with the remote tags!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1767425459.885082, + "completed_at": 1767425462.823506, + "comments": [ + "You are missing the bug-fix branch" + ], + "status": "Incomplete" } ] \ No newline at end of file From 060cbec2319106ffa698205c37b82c2389a67c07 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 00:35:44 +0800 Subject: [PATCH 05/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4952db107..47ebcb32f 100644 --- a/progress.json +++ b/progress.json @@ -264,5 +264,14 @@ "You are missing the bug-fix branch" ], "status": "Incomplete" + }, + { + "exercise_name": "branch-previous", + "started_at": 1767458140.124598, + "completed_at": 1767458143.798026, + "comments": [ + "The 'visitor-line' branch is missing." + ], + "status": "Incomplete" } ] \ No newline at end of file From ffa90b15c342ca29c981cf4831d9824ef8e03d2f Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:01:20 +0800 Subject: [PATCH 06/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 47ebcb32f..b18b89d9d 100644 --- a/progress.json +++ b/progress.json @@ -273,5 +273,14 @@ "The 'visitor-line' branch is missing." ], "status": "Incomplete" + }, + { + "exercise_name": "undo-init", + "started_at": 1767531677.23451, + "completed_at": 1767531680.058801, + "comments": [ + "The init operation is not undone." + ], + "status": "Incomplete" } ] \ No newline at end of file From 8ba1cf5d26c2ab0ccf41696b0ad00f5edc170b3e Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:01:36 +0800 Subject: [PATCH 07/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b18b89d9d..85ddf1f37 100644 --- a/progress.json +++ b/progress.json @@ -282,5 +282,14 @@ "The init operation is not undone." ], "status": "Incomplete" + }, + { + "exercise_name": "undo-init", + "started_at": 1767531694.659228, + "completed_at": 1767531696.262834, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 1bb62eb763599f86302dfbac21bb49e3f4190400 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:03:14 +0800 Subject: [PATCH 08/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 85ddf1f37..72ced7fb3 100644 --- a/progress.json +++ b/progress.json @@ -291,5 +291,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767531792.16163, + "completed_at": 1767531793.796024, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 220da7e7fdc3a662be54908eab3d096a2f092b43 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:13:39 +0800 Subject: [PATCH 09/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 72ced7fb3..3d9301c63 100644 --- a/progress.json +++ b/progress.json @@ -300,5 +300,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767532417.487475, + "completed_at": 1767532419.13573, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From fd03dc4adf40a62bd8f90a8fd558ac84556454bb Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:38:12 +0800 Subject: [PATCH 10/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3d9301c63..aeee2797b 100644 --- a/progress.json +++ b/progress.json @@ -309,5 +309,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767533890.311603, + "completed_at": 1767533891.80303, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 58baaf471cce90b44ca0b499cbde266021b247c2 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:40:11 +0800 Subject: [PATCH 11/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index aeee2797b..11baeb61d 100644 --- a/progress.json +++ b/progress.json @@ -318,5 +318,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767534009.288327, + "completed_at": 1767534010.966381, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 3d7f8fd60dfdbbdb5f2857e087fef6d091ae3504 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:40:26 +0800 Subject: [PATCH 12/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 11baeb61d..33c2528f2 100644 --- a/progress.json +++ b/progress.json @@ -327,5 +327,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767534024.226885, + "completed_at": 1767534025.701783, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From d091149c1eb7691d9f8ae003ede9006a054d255d Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 21:55:27 +0800 Subject: [PATCH 13/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 33c2528f2..3cf592ce9 100644 --- a/progress.json +++ b/progress.json @@ -336,5 +336,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767534924.899294, + "completed_at": 1767534926.586795, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 4293c8c39da5c922b6bb893bc5dff8cccb209ba4 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 22:00:50 +0800 Subject: [PATCH 14/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3cf592ce9..4ec8f9b09 100644 --- a/progress.json +++ b/progress.json @@ -345,5 +345,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767535248.678927, + "completed_at": 1767535250.339478, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 652c6c3c7c2db08bd9ce74b379af09361cdcb8b2 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 22:06:06 +0800 Subject: [PATCH 15/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4ec8f9b09..cf286914b 100644 --- a/progress.json +++ b/progress.json @@ -354,5 +354,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767535563.920548, + "completed_at": 1767535565.520279, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" } ] \ No newline at end of file From 8fc9fd9bca6622f7785a0102b9e379d7b421553e Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 4 Jan 2026 23:33:23 +0800 Subject: [PATCH 16/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index cf286914b..3b650c502 100644 --- a/progress.json +++ b/progress.json @@ -363,5 +363,14 @@ "Exercise is not a Git repository" ], "status": "Error" + }, + { + "exercise_name": "undo-init", + "started_at": 1767540800.724125, + "completed_at": 1767540802.071598, + "comments": [ + "You have successfully undone the init operation!" + ], + "status": "Completed" } ] \ No newline at end of file From bc147c2ee9e155d4c74a9d4592884614110d35f1 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 20:59:13 +0800 Subject: [PATCH 17/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3b650c502..515e113ef 100644 --- a/progress.json +++ b/progress.json @@ -372,5 +372,14 @@ "You have successfully undone the init operation!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1767617950.04669, + "completed_at": 1767617953.187411, + "comments": [ + "You are missing the bug-fix branch" + ], + "status": "Incomplete" } ] \ No newline at end of file From 3a7ed9e79ee81cbf7ad33689befda451053aad9b Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:00:45 +0800 Subject: [PATCH 18/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 515e113ef..456ed06bc 100644 --- a/progress.json +++ b/progress.json @@ -381,5 +381,14 @@ "You are missing the bug-fix branch" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1767618041.624165, + "completed_at": 1767618044.870204, + "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 5758fb6e338330bafc8cbf6254d372e6ac2011eb Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:04:39 +0800 Subject: [PATCH 19/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 456ed06bc..9bd8704b4 100644 --- a/progress.json +++ b/progress.json @@ -390,5 +390,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1767618276.506435, + "completed_at": 1767618278.437821, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From 3c71c86b680d7516e6be2cbf22b21b2d96542100 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:07:57 +0800 Subject: [PATCH 20/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9bd8704b4..9f6feec1d 100644 --- a/progress.json +++ b/progress.json @@ -399,5 +399,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1767618474.107606, + "completed_at": 1767618477.226351, + "comments": [ + "The 'visitor-line' branch is missing." + ], + "status": "Incomplete" } ] \ No newline at end of file From f1326f1f71da47b6b54c946877999eed6fd63c9a Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:10:04 +0800 Subject: [PATCH 21/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9f6feec1d..fb872d158 100644 --- a/progress.json +++ b/progress.json @@ -408,5 +408,14 @@ "The 'visitor-line' branch is missing." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-previous", + "started_at": 1767618601.155042, + "completed_at": 1767618604.190595, + "comments": [ + "No commits were made in the 'visitor-line' branch." + ], + "status": "Incomplete" } ] \ No newline at end of file From 2cb9a41c966e55c9410630ec44475f29de6091df Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:10:39 +0800 Subject: [PATCH 22/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index fb872d158..6e2c632f0 100644 --- a/progress.json +++ b/progress.json @@ -417,5 +417,14 @@ "No commits were made in the 'visitor-line' branch." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-previous", + "started_at": 1767618635.488593, + "completed_at": 1767618638.483461, + "comments": [ + "The 'sleep-line' branch is missing." + ], + "status": "Incomplete" } ] \ No newline at end of file From 9c58d46ec95eacf2494750042943b3ba71366b4b Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:11:23 +0800 Subject: [PATCH 23/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6e2c632f0..5addef3f7 100644 --- a/progress.json +++ b/progress.json @@ -426,5 +426,14 @@ "The 'sleep-line' branch is missing." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-previous", + "started_at": 1767618681.248274, + "completed_at": 1767618682.82495, + "comments": [ + "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" + ], + "status": "Completed" } ] \ No newline at end of file From c87c23a9d65d310654257397ccabdb6bcc62d4c6 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:24:49 +0800 Subject: [PATCH 24/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5addef3f7..c5bc6bca8 100644 --- a/progress.json +++ b/progress.json @@ -435,5 +435,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1767619485.40179, + "completed_at": 1767619488.577847, + "comments": [ + "You need to start merging the feature branches." + ], + "status": "Incomplete" } ] \ No newline at end of file From 7aabca30f4b7646c65b29dee70a2db832d168682 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:25:15 +0800 Subject: [PATCH 25/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c5bc6bca8..e6fb0a738 100644 --- a/progress.json +++ b/progress.json @@ -444,5 +444,14 @@ "You need to start merging the feature branches." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-bender", + "started_at": 1767619512.254632, + "completed_at": 1767619515.320094, + "comments": [ + "You are missing some merges" + ], + "status": "Incomplete" } ] \ No newline at end of file From f5a392a583d51f563bf3a99ac90ea46f41ba1ef6 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:26:43 +0800 Subject: [PATCH 26/63] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index e6fb0a738..87072558b 100644 --- a/progress.json +++ b/progress.json @@ -453,5 +453,15 @@ "You are missing some merges" ], "status": "Incomplete" + }, + { + "exercise_name": "branch-bender", + "started_at": 1767619598.419471, + "completed_at": 1767619601.871632, + "comments": [ + "You cannot use fast forwarding on feature/login when merging.", + "Reset the repository using \"gitmastery progress reset\" and start again" + ], + "status": "Incomplete" } ] \ No newline at end of file From 246803528b3c24e7e813cf0f31278852de5f9c0d Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:29:20 +0800 Subject: [PATCH 27/63] Reset progress for branch-bender --- progress.json | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/progress.json b/progress.json index 87072558b..5addef3f7 100644 --- a/progress.json +++ b/progress.json @@ -435,33 +435,5 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" - }, - { - "exercise_name": "branch-bender", - "started_at": 1767619485.40179, - "completed_at": 1767619488.577847, - "comments": [ - "You need to start merging the feature branches." - ], - "status": "Incomplete" - }, - { - "exercise_name": "branch-bender", - "started_at": 1767619512.254632, - "completed_at": 1767619515.320094, - "comments": [ - "You are missing some merges" - ], - "status": "Incomplete" - }, - { - "exercise_name": "branch-bender", - "started_at": 1767619598.419471, - "completed_at": 1767619601.871632, - "comments": [ - "You cannot use fast forwarding on feature/login when merging.", - "Reset the repository using \"gitmastery progress reset\" and start again" - ], - "status": "Incomplete" } ] \ No newline at end of file From e7167d0b57ff0a26d38cb16f76862acb010cac64 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:30:17 +0800 Subject: [PATCH 28/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5addef3f7..4decbea11 100644 --- a/progress.json +++ b/progress.json @@ -435,5 +435,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1767619815.365977, + "completed_at": 1767619816.677046, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 311cf400a2daad320f547886246efe1b1f98319a Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:30:45 +0800 Subject: [PATCH 29/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4decbea11..468467d1e 100644 --- a/progress.json +++ b/progress.json @@ -444,5 +444,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1767619841.726739, + "completed_at": 1767619844.611812, + "comments": [ + "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." + ], + "status": "Incomplete" } ] \ No newline at end of file From a373d5590c749ba6c1c5da4bdac68e309ef89c08 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:32:17 +0800 Subject: [PATCH 30/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 468467d1e..05f69c843 100644 --- a/progress.json +++ b/progress.json @@ -453,5 +453,14 @@ "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-forward", + "started_at": 1767619933.914535, + "completed_at": 1767619936.999676, + "comments": [ + "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." + ], + "status": "Incomplete" } ] \ No newline at end of file From 27a95b70e1fa399316b777d8a95e96537f587402 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:39:31 +0800 Subject: [PATCH 31/63] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 05f69c843..25cbaddac 100644 --- a/progress.json +++ b/progress.json @@ -462,5 +462,15 @@ "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1767620367.56818, + "completed_at": 1767620370.551482, + "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 660d8a3d34c789cbbe546920eb087f6229a8381b Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:45:03 +0800 Subject: [PATCH 32/63] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 25cbaddac..d97e625d9 100644 --- a/progress.json +++ b/progress.json @@ -472,5 +472,15 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1767620699.162354, + "completed_at": 1767620702.332655, + "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 10c39ac9427e33fd34a3e147b5b83f5459f943b7 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:45:29 +0800 Subject: [PATCH 33/63] Reset progress for conflict-mediator --- progress.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/progress.json b/progress.json index d97e625d9..05f69c843 100644 --- a/progress.json +++ b/progress.json @@ -462,25 +462,5 @@ "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." ], "status": "Incomplete" - }, - { - "exercise_name": "conflict-mediator", - "started_at": 1767620367.56818, - "completed_at": 1767620370.551482, - "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" - }, - { - "exercise_name": "conflict-mediator", - "started_at": 1767620699.162354, - "completed_at": 1767620702.332655, - "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 aa176e15a887b640513af8f44a51b6736d875f35 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:47:27 +0800 Subject: [PATCH 34/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 05f69c843..0c775b0c7 100644 --- a/progress.json +++ b/progress.json @@ -462,5 +462,14 @@ "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1767620844.089274, + "completed_at": 1767620847.113223, + "comments": [ + "You still have uncommitted changes. Commit them first on the appropriate branch first!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 452c00937d6d1280970b8e78e8f3acaaa502cdae Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:48:34 +0800 Subject: [PATCH 35/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0c775b0c7..4747741b1 100644 --- a/progress.json +++ b/progress.json @@ -471,5 +471,14 @@ "You still have uncommitted changes. Commit them first on the appropriate branch first!" ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1767620912.256061, + "completed_at": 1767620913.74862, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 85b26cfb56880a9187bd0bd6b73247bf83915994 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:50:10 +0800 Subject: [PATCH 36/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4747741b1..0452ba01e 100644 --- a/progress.json +++ b/progress.json @@ -480,5 +480,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1767621006.161487, + "completed_at": 1767621009.167674, + "comments": [ + "Branch 'login' still exists! Remember to rename it to 'feature/login'" + ], + "status": "Incomplete" } ] \ No newline at end of file From a9ce2ee6120073247501746c68155341bf29219f Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:51:21 +0800 Subject: [PATCH 37/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0452ba01e..9d7715228 100644 --- a/progress.json +++ b/progress.json @@ -489,5 +489,14 @@ "Branch 'login' still exists! Remember to rename it to 'feature/login'" ], "status": "Incomplete" + }, + { + "exercise_name": "branch-rename", + "started_at": 1767621079.130477, + "completed_at": 1767621080.466137, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 1cc6c73a58023790440bfec96692e7151a5a8090 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:52:20 +0800 Subject: [PATCH 38/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9d7715228..c2dce731d 100644 --- a/progress.json +++ b/progress.json @@ -498,5 +498,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1767621137.139723, + "completed_at": 1767621140.29129, + "comments": [ + "Branch 'optimization-approach-1' still exists! Remember to delete it" + ], + "status": "Incomplete" } ] \ No newline at end of file From fb4eb814b1f584b4f6dc3a4b1dc6af36228e0212 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:53:23 +0800 Subject: [PATCH 39/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c2dce731d..0e4af6469 100644 --- a/progress.json +++ b/progress.json @@ -507,5 +507,14 @@ "Branch 'optimization-approach-1' still exists! Remember to delete it" ], "status": "Incomplete" + }, + { + "exercise_name": "branch-delete", + "started_at": 1767621200.756311, + "completed_at": 1767621202.099362, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file From cd666160d80c38bc4cbde157652e034840d860b3 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:53:51 +0800 Subject: [PATCH 40/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0e4af6469..cacf1398e 100644 --- a/progress.json +++ b/progress.json @@ -516,5 +516,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621227.787162, + "completed_at": 1767621230.974273, + "comments": [ + "You are missing the 'development' branch!" + ], + "status": "Incomplete" } ] \ No newline at end of file From edd27656d1d5e33e76d88fc4c5ca92b43a52b0ba Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:54:37 +0800 Subject: [PATCH 41/63] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index cacf1398e..644b40ddb 100644 --- a/progress.json +++ b/progress.json @@ -525,5 +525,15 @@ "You are missing the 'development' branch!" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621273.322172, + "completed_at": 1767621276.556624, + "comments": [ + "You need to merge 'feature-search' first!", + "Reset the repository using \"gitmastery progress reset\" and start again" + ], + "status": "Incomplete" } ] \ No newline at end of file From e1c4383288fea60c6c0d5654d9af59e7b692bb3e Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:55:14 +0800 Subject: [PATCH 42/63] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 644b40ddb..091e8db59 100644 --- a/progress.json +++ b/progress.json @@ -535,5 +535,15 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621310.363451, + "completed_at": 1767621313.380783, + "comments": [ + "You need to merge 'feature-delete' second!", + "Reset the repository using \"gitmastery progress reset\" and start again" + ], + "status": "Incomplete" } ] \ No newline at end of file From 8f38db5173222026a4fb33a1a350804c3a9e9756 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:56:00 +0800 Subject: [PATCH 43/63] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 091e8db59..ca5fb6960 100644 --- a/progress.json +++ b/progress.json @@ -545,5 +545,15 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621357.322677, + "completed_at": 1767621360.312309, + "comments": [ + "You need to merge 'feature-delete' second!", + "Reset the repository using \"gitmastery progress reset\" and start again" + ], + "status": "Incomplete" } ] \ No newline at end of file From 5691fe4145e2ccc313e94a7e764af428d9042c3d Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:57:25 +0800 Subject: [PATCH 44/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ca5fb6960..2a8e22b30 100644 --- a/progress.json +++ b/progress.json @@ -555,5 +555,14 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621441.555456, + "completed_at": 1767621444.838195, + "comments": [ + "Branch 'list' still exists! Remember to rename it to 'feature-list'!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 912ab82434f21646ce38a17b22aedb9950752626 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:57:52 +0800 Subject: [PATCH 45/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 2a8e22b30..e79ce6ee3 100644 --- a/progress.json +++ b/progress.json @@ -564,5 +564,14 @@ "Branch 'list' still exists! Remember to rename it to 'feature-list'!" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621468.653616, + "completed_at": 1767621471.596388, + "comments": [ + "Contents of 'features.md' is not valid! Try again!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 05ae59180fac9df5c36ffb9fa15dc7596ffa2053 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:58:24 +0800 Subject: [PATCH 46/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e79ce6ee3..50ca8b852 100644 --- a/progress.json +++ b/progress.json @@ -573,5 +573,14 @@ "Contents of 'features.md' is not valid! Try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621501.19647, + "completed_at": 1767621504.222718, + "comments": [ + "Contents of 'features.md' is not valid! Try again!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 8f6874e7b9b721920ae931aa3b8091d5d1e25330 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:59:10 +0800 Subject: [PATCH 47/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 50ca8b852..db0a93554 100644 --- a/progress.json +++ b/progress.json @@ -582,5 +582,14 @@ "Contents of 'features.md' is not valid! Try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621545.874156, + "completed_at": 1767621548.996419, + "comments": [ + "Contents of 'features.md' is not valid! Try again!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 3d312cdf649fe1617e3f0f4f73fe77bb49be5c0a Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:59:30 +0800 Subject: [PATCH 48/63] Reset progress for mix-messy-docs --- progress.json | 75 --------------------------------------------------- 1 file changed, 75 deletions(-) diff --git a/progress.json b/progress.json index db0a93554..0e4af6469 100644 --- a/progress.json +++ b/progress.json @@ -516,80 +516,5 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1767621227.787162, - "completed_at": 1767621230.974273, - "comments": [ - "You are missing the 'development' branch!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1767621273.322172, - "completed_at": 1767621276.556624, - "comments": [ - "You need to merge 'feature-search' first!", - "Reset the repository using \"gitmastery progress reset\" and start again" - ], - "status": "Incomplete" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1767621310.363451, - "completed_at": 1767621313.380783, - "comments": [ - "You need to merge 'feature-delete' second!", - "Reset the repository using \"gitmastery progress reset\" and start again" - ], - "status": "Incomplete" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1767621357.322677, - "completed_at": 1767621360.312309, - "comments": [ - "You need to merge 'feature-delete' second!", - "Reset the repository using \"gitmastery progress reset\" and start again" - ], - "status": "Incomplete" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1767621441.555456, - "completed_at": 1767621444.838195, - "comments": [ - "Branch 'list' still exists! Remember to rename it to 'feature-list'!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1767621468.653616, - "completed_at": 1767621471.596388, - "comments": [ - "Contents of 'features.md' is not valid! Try again!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1767621501.19647, - "completed_at": 1767621504.222718, - "comments": [ - "Contents of 'features.md' is not valid! Try again!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1767621545.874156, - "completed_at": 1767621548.996419, - "comments": [ - "Contents of 'features.md' is not valid! Try again!" - ], - "status": "Incomplete" } ] \ No newline at end of file From a1e85a4bae059d5d5966d28625c7538aba79106a Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 21:59:54 +0800 Subject: [PATCH 49/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0e4af6469..aa4e2c16a 100644 --- a/progress.json +++ b/progress.json @@ -516,5 +516,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1767621591.137514, + "completed_at": 1767621594.083774, + "comments": [ + "Expected commit message of 'Add the search feature', got '' instead." + ], + "status": "Incomplete" } ] \ No newline at end of file From fe36bb830b52822a3b22025e1833ef743af0d58d Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 22:01:30 +0800 Subject: [PATCH 50/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index aa4e2c16a..741b1acbb 100644 --- a/progress.json +++ b/progress.json @@ -525,5 +525,14 @@ "Expected commit message of 'Add the search feature', got '' instead." ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1767621686.977618, + "completed_at": 1767621689.992416, + "comments": [ + "Contents of 'features.md' is not valid! Try again!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 4eb299aca1c35279e3715d9dfdbbfd83def2dd94 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 22:01:50 +0800 Subject: [PATCH 51/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 741b1acbb..a7fc01154 100644 --- a/progress.json +++ b/progress.json @@ -534,5 +534,14 @@ "Contents of 'features.md' is not valid! Try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1767621706.429313, + "completed_at": 1767621709.739861, + "comments": [ + "Expected commit message of 'Add the delete feature', got '' instead." + ], + "status": "Incomplete" } ] \ No newline at end of file From d99a8eda4c97d89634b758275c706b56df9d0e47 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 22:02:50 +0800 Subject: [PATCH 52/63] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index a7fc01154..7a38f6536 100644 --- a/progress.json +++ b/progress.json @@ -543,5 +543,15 @@ "Expected commit message of 'Add the delete feature', got '' instead." ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1767621765.936179, + "completed_at": 1767621769.203177, + "comments": [ + "Branch 'feature-search' still exists.", + "Branch 'feature-delete' still exists." + ], + "status": "Incomplete" } ] \ No newline at end of file From 726e67230e6d2c1770af39deba5ed5f826a4a89c Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 22:03:27 +0800 Subject: [PATCH 53/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7a38f6536..7ae331b0c 100644 --- a/progress.json +++ b/progress.json @@ -553,5 +553,14 @@ "Branch 'feature-delete' still exists." ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1767621805.231918, + "completed_at": 1767621806.768807, + "comments": [ + "You have successfully completed the exercise!" + ], + "status": "Completed" } ] \ No newline at end of file From 58352704def73435965a4f95d3f6648cd3e2e512 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 22:10:29 +0800 Subject: [PATCH 54/63] Reset progress for side-track --- progress.json | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/progress.json b/progress.json index 7ae331b0c..e6307423f 100644 --- a/progress.json +++ b/progress.json @@ -256,15 +256,6 @@ ], "status": "Completed" }, - { - "exercise_name": "side-track", - "started_at": 1767425459.885082, - "completed_at": 1767425462.823506, - "comments": [ - "You are missing the bug-fix branch" - ], - "status": "Incomplete" - }, { "exercise_name": "branch-previous", "started_at": 1767458140.124598, @@ -373,33 +364,6 @@ ], "status": "Completed" }, - { - "exercise_name": "side-track", - "started_at": 1767617950.04669, - "completed_at": 1767617953.187411, - "comments": [ - "You are missing the bug-fix branch" - ], - "status": "Incomplete" - }, - { - "exercise_name": "side-track", - "started_at": 1767618041.624165, - "completed_at": 1767618044.870204, - "comments": [ - "You aren't currently on the main branch. Checkout to that branch and try again!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "side-track", - "started_at": 1767618276.506435, - "completed_at": 1767618278.437821, - "comments": [ - "Great work with using git branch and git checkout to fix the bugs!" - ], - "status": "Completed" - }, { "exercise_name": "branch-previous", "started_at": 1767618474.107606, From ddca232348caee20a6c2c5f3faedb6dc02f4c0ae Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 22:11:01 +0800 Subject: [PATCH 55/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e6307423f..3cadc8a75 100644 --- a/progress.json +++ b/progress.json @@ -526,5 +526,14 @@ "You have successfully completed the exercise!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1767622257.667627, + "completed_at": 1767622260.91656, + "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 bc2941c3081861cce1b65c91e6fa8e3a2e2cd9ca Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Mon, 5 Jan 2026 23:09:10 +0800 Subject: [PATCH 56/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3cadc8a75..c36c26864 100644 --- a/progress.json +++ b/progress.json @@ -535,5 +535,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "branch-forward", + "started_at": 1767625747.650313, + "completed_at": 1767625749.801847, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From 1ca615a62bb5b7b3956ebf4da13f1220f81ded57 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Tue, 6 Jan 2026 21:15:20 +0800 Subject: [PATCH 57/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c36c26864..5b6822065 100644 --- a/progress.json +++ b/progress.json @@ -544,5 +544,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1767705318.285045, + "completed_at": 1767705319.777071, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 1fd04d1dd12b420f0aec3f0a2eda71622e54f50f Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Tue, 6 Jan 2026 23:28:17 +0800 Subject: [PATCH 58/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 5b6822065..514f7ee83 100644 --- a/progress.json +++ b/progress.json @@ -553,5 +553,14 @@ "You successfully used git init to initialize this folder as a Git repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1767713293.563888, + "completed_at": 1767713296.931274, + "comments": [ + "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." + ], + "status": "Incomplete" } ] \ No newline at end of file From 61f01bd454d78a658ca0c31cc0a20897c02a506c Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Tue, 6 Jan 2026 23:46:56 +0800 Subject: [PATCH 59/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 514f7ee83..5d71af45a 100644 --- a/progress.json +++ b/progress.json @@ -562,5 +562,14 @@ "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-bender", + "started_at": 1767714413.917837, + "completed_at": 1767714415.448405, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From b88ab9426c94a80ec21315d9c5627885f9cda373 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Tue, 6 Jan 2026 23:47:24 +0800 Subject: [PATCH 60/63] Reset progress for branch-bender --- progress.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/progress.json b/progress.json index 5d71af45a..9d166c847 100644 --- a/progress.json +++ b/progress.json @@ -400,15 +400,6 @@ ], "status": "Completed" }, - { - "exercise_name": "branch-bender", - "started_at": 1767619815.365977, - "completed_at": 1767619816.677046, - "comments": [ - "Great work with merging the branches in order! Try running the HTML files locally!" - ], - "status": "Completed" - }, { "exercise_name": "branch-forward", "started_at": 1767619841.726739, @@ -562,14 +553,5 @@ "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." ], "status": "Incomplete" - }, - { - "exercise_name": "branch-bender", - "started_at": 1767714413.917837, - "completed_at": 1767714415.448405, - "comments": [ - "Great work with merging the branches in order! Try running the HTML files locally!" - ], - "status": "Completed" } ] \ No newline at end of file From 4fb342af1a5205bd7ff9bb21a8fc8090f4caf898 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Tue, 6 Jan 2026 23:48:07 +0800 Subject: [PATCH 61/63] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 9d166c847..d44f6f0b3 100644 --- a/progress.json +++ b/progress.json @@ -553,5 +553,15 @@ "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-bender", + "started_at": 1767714483.828272, + "completed_at": 1767714486.842245, + "comments": [ + "You cannot use fast forwarding on feature/login when merging.", + "Reset the repository using \"gitmastery progress reset\" and start again" + ], + "status": "Incomplete" } ] \ No newline at end of file From 4212c51eb2911b54d10590f11258baecdba48bc3 Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 11 Jan 2026 10:08:13 +0800 Subject: [PATCH 62/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d44f6f0b3..006508ac6 100644 --- a/progress.json +++ b/progress.json @@ -563,5 +563,14 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1768097289.77938, + "completed_at": 1768097292.647966, + "comments": [ + "All commits are empty." + ], + "status": "Incomplete" } ] \ No newline at end of file From 542e19c9319424ae4e053898a51560a4b6d5e47e Mon Sep 17 00:00:00 2001 From: jovnc <95868357+jovnc@users.noreply.github.com> Date: Sun, 11 Jan 2026 10:17:29 +0800 Subject: [PATCH 63/63] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 006508ac6..fc1793423 100644 --- a/progress.json +++ b/progress.json @@ -572,5 +572,14 @@ "All commits are empty." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1768097845.711354, + "completed_at": 1768097848.622537, + "comments": [ + "You have not made any commits yet!" + ], + "status": "Incomplete" } ] \ No newline at end of file