From a80cb0257188c97fde9988fa66a4c9b9e27e98ca Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Tue, 25 Aug 2026 21:42:03 +0800 Subject: [PATCH 01/24] Update progress --- progress.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 0000000000..3656884d65 --- /dev/null +++ b/progress.json @@ -0,0 +1,11 @@ +[ + { + "exercise_name": "side-track", + "started_at": 1787665317.887141, + "completed_at": 1787665322.496738, + "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 126679925ecda5d5bd78eeee429060ba80db4b9b Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Tue, 25 Aug 2026 21:42:51 +0800 Subject: [PATCH 02/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3656884d65..7920e6aee9 100644 --- a/progress.json +++ b/progress.json @@ -7,5 +7,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1787665368.210275, + "completed_at": 1787665370.406947, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From b3c81c90aa6e8acda75341995b859176899b9731 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Tue, 25 Aug 2026 21:46:07 +0800 Subject: [PATCH 03/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7920e6aee9..b721851b08 100644 --- a/progress.json +++ b/progress.json @@ -16,5 +16,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1787665563.22882, + "completed_at": 1787665567.119388, + "comments": [ + "The 'sleep-line' branch should start from the second commit (with message 'Describe location')." + ], + "status": "Incomplete" } ] \ No newline at end of file From 39c43aedc524d6af8ff7b49676fdf6fa0851780d Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Tue, 25 Aug 2026 21:47:08 +0800 Subject: [PATCH 04/24] Reset progress for branch-previous --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index b721851b08..7920e6aee9 100644 --- a/progress.json +++ b/progress.json @@ -16,14 +16,5 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" - }, - { - "exercise_name": "branch-previous", - "started_at": 1787665563.22882, - "completed_at": 1787665567.119388, - "comments": [ - "The 'sleep-line' branch should start from the second commit (with message 'Describe location')." - ], - "status": "Incomplete" } ] \ No newline at end of file From c19206f158b1ee9c5989036b99f74f55ea3bb980 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Tue, 25 Aug 2026 21:48:57 +0800 Subject: [PATCH 05/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7920e6aee9..a8f2111c46 100644 --- a/progress.json +++ b/progress.json @@ -16,5 +16,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1787665734.745261, + "completed_at": 1787665736.887534, + "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 999958c97aee5bacb52035818270beb11dca9af4 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:42:24 +0800 Subject: [PATCH 06/24] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index a8f2111c46..e1bad5f8b4 100644 --- a/progress.json +++ b/progress.json @@ -25,5 +25,15 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1787712140.342775, + "completed_at": 1787712144.187607, + "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 6b78eea2c84a43a0a8afe4a38e2006e16265090b Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:42:54 +0800 Subject: [PATCH 07/24] Reset progress for branch-bender --- progress.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/progress.json b/progress.json index e1bad5f8b4..a8f2111c46 100644 --- a/progress.json +++ b/progress.json @@ -25,15 +25,5 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" - }, - { - "exercise_name": "branch-bender", - "started_at": 1787712140.342775, - "completed_at": 1787712144.187607, - "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 a21199d9c53d56d7e17816323b1003c4888b5bc4 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:44:54 +0800 Subject: [PATCH 08/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a8f2111c46..78deb92a80 100644 --- a/progress.json +++ b/progress.json @@ -25,5 +25,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1787712290.946673, + "completed_at": 1787712293.714914, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 7bc013b338965e1f4dcaa40f07ae3269d4815079 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:49:23 +0800 Subject: [PATCH 09/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 78deb92a80..c52df8d338 100644 --- a/progress.json +++ b/progress.json @@ -34,5 +34,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1787712560.694455, + "completed_at": 1787712562.720811, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From a67d61f2d38c7b45380d9fba95c6549af1d331bb Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:51:29 +0800 Subject: [PATCH 10/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c52df8d338..c43b40d047 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1787712687.252206, + "completed_at": 1787712689.363342, + "comments": [ + "Great work with undoing the merges! Try listing the directory to see what has changed." + ], + "status": "Completed" } ] \ No newline at end of file From a6849ca22730d28ef85c708eb47b07f59114214e Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:55:06 +0800 Subject: [PATCH 11/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c43b40d047..c4bcda1f51 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1787712901.904615, + "completed_at": 1787712906.144881, + "comments": [ + "The main branch does not contain the expected commits." + ], + "status": "Incomplete" } ] \ No newline at end of file From fa4e93e53c8e89ac02e65b26270d90c7d1bbee96 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:55:37 +0800 Subject: [PATCH 12/24] Reset progress for ff-undo --- progress.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/progress.json b/progress.json index c4bcda1f51..c43b40d047 100644 --- a/progress.json +++ b/progress.json @@ -52,14 +52,5 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" - }, - { - "exercise_name": "ff-undo", - "started_at": 1787712901.904615, - "completed_at": 1787712906.144881, - "comments": [ - "The main branch does not contain the expected commits." - ], - "status": "Incomplete" } ] \ No newline at end of file From 407770bc7362b1e2cdee0d99d99928836eae7350 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:56:15 +0800 Subject: [PATCH 13/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c43b40d047..45ebc3def3 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1787712972.915994, + "completed_at": 1787712975.144496, + "comments": [ + "You have successfully undone the merge of branch 'others'." + ], + "status": "Completed" } ] \ No newline at end of file From 480390261ad4c60be58202cd73fa8e953146ebea Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 10:59:25 +0800 Subject: [PATCH 14/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 45ebc3def3..a0475bf131 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "You have successfully undone the merge of branch 'others'." ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1787713162.198204, + "completed_at": 1787713165.018974, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From 1d60b384a5df5a36a21326a9cc2c4c48c266919c Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 11:02:33 +0800 Subject: [PATCH 15/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a0475bf131..3c4e830776 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "merge-squash", + "started_at": 1787713351.149121, + "completed_at": 1787713353.300774, + "comments": [ + "Good job performing a merge squash!" + ], + "status": "Completed" } ] \ No newline at end of file From b51823bf8237b6b11bdc630c4f6c2dc6e2550b2f Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 11:09:15 +0800 Subject: [PATCH 16/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3c4e830776..40c44bda27 100644 --- a/progress.json +++ b/progress.json @@ -79,5 +79,14 @@ "Good job performing a merge squash!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1787713752.74931, + "completed_at": 1787713755.117525, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 6ebf79a90f148df6b15c7ca9ab29216eb1c6cf65 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 11:11:23 +0800 Subject: [PATCH 17/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 40c44bda27..398c4e8104 100644 --- a/progress.json +++ b/progress.json @@ -88,5 +88,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1787713881.119872, + "completed_at": 1787713883.152563, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From d2c9d50b12228e8f8fc193dc775bd12fb12ee74f Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 11:16:22 +0800 Subject: [PATCH 18/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 398c4e8104..57a709fbdf 100644 --- a/progress.json +++ b/progress.json @@ -97,5 +97,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1787714179.290869, + "completed_at": 1787714181.4116, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file From 44b761a509897b1449dc40f98c979b8b19b81a89 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 11:21:47 +0800 Subject: [PATCH 19/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 57a709fbdf..b729367569 100644 --- a/progress.json +++ b/progress.json @@ -106,5 +106,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1787714502.592341, + "completed_at": 1787714506.758453, + "comments": [ + "Branch 'feature-search' still exists! Remember to delete it after merging!" + ], + "status": "Incomplete" } ] \ No newline at end of file From dbf98d405bdeeebf8a03151e8d8b1144a1f43531 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 11:22:31 +0800 Subject: [PATCH 20/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b729367569..f62be4420b 100644 --- a/progress.json +++ b/progress.json @@ -115,5 +115,14 @@ "Branch 'feature-search' still exists! Remember to delete it after merging!" ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1787714546.931018, + "completed_at": 1787714550.97152, + "comments": [ + "You need to merge 'feature-delete' second!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 39b8eff473653ea767e8a76a79930431da241330 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 11:23:59 +0800 Subject: [PATCH 21/24] Reset progress for mix-messy-docs --- progress.json | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/progress.json b/progress.json index f62be4420b..57a709fbdf 100644 --- a/progress.json +++ b/progress.json @@ -106,23 +106,5 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1787714502.592341, - "completed_at": 1787714506.758453, - "comments": [ - "Branch 'feature-search' still exists! Remember to delete it after merging!" - ], - "status": "Incomplete" - }, - { - "exercise_name": "mix-messy-docs", - "started_at": 1787714546.931018, - "completed_at": 1787714550.97152, - "comments": [ - "You need to merge 'feature-delete' second!" - ], - "status": "Incomplete" } ] \ No newline at end of file From f4e0e7f969ec39956fee47eb1d0a54a436f9f13d Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 11:30:43 +0800 Subject: [PATCH 22/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 57a709fbdf..aec548044a 100644 --- a/progress.json +++ b/progress.json @@ -106,5 +106,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1787715040.404278, + "completed_at": 1787715042.603609, + "comments": [ + "Great work using all of the concepts you've learnt about branching to mix the messy documentation!" + ], + "status": "Completed" } ] \ No newline at end of file From 7b22b0760c54f9792b8687caeec96e6d6dd6812b Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 16:06:48 +0800 Subject: [PATCH 23/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index aec548044a..d74cdff094 100644 --- a/progress.json +++ b/progress.json @@ -115,5 +115,14 @@ "Great work using all of the concepts you've learnt about branching to mix the messy documentation!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1787731603.66688, + "completed_at": 1787731607.739779, + "comments": [ + "Branch 'feature-delete' still exists." + ], + "status": "Incomplete" } ] \ No newline at end of file From 0e34a62f48a882b5f8eb0c533897c7a9ae0a0506 Mon Sep 17 00:00:00 2001 From: Zhou Xinyu Date: Wed, 26 Aug 2026 16:07:07 +0800 Subject: [PATCH 24/24] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d74cdff094..512e9b0894 100644 --- a/progress.json +++ b/progress.json @@ -124,5 +124,14 @@ "Branch 'feature-delete' still exists." ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1787731624.221531, + "completed_at": 1787731626.768465, + "comments": [ + "You have successfully completed the exercise!" + ], + "status": "Completed" } ] \ No newline at end of file