From d944d48f2ed8330db63d369270d6507a4378be90 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 10:32:00 +0800 Subject: [PATCH 01/22] Sync progress with local machine --- progress.json | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 0000000000..6afb0685f0 --- /dev/null +++ b/progress.json @@ -0,0 +1,207 @@ +[ + { + "exercise_name": "clone-repo", + "started_at": 1787807392.906295, + "completed_at": 1787807398.282978, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1787807607.747137, + "completed_at": 1787807611.200282, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1787807262.143867, + "completed_at": 1787807267.542299, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1787733046.171657, + "completed_at": 1787733048.665296, + "comments": [ + "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!" + ], + "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1787807065.580636, + "completed_at": 1787807076.127732, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1787804604.213778, + "completed_at": 1787804610.127252, + "comments": [ + "Missing remote called 'upstream'." + ], + "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1787805221.309033, + "completed_at": 1787805226.961954, + "comments": [ + "Wrong 'upstream' remote URL" + ], + "status": "Incomplete" + }, + { + "exercise_name": "link-me", + "started_at": 1787805334.383288, + "completed_at": 1787805337.686458, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" + }, + { + "exercise_name": "log-and-order", + "started_at": 1787733272.08154, + "completed_at": 1787733274.667247, + "comments": [], + "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1787805780.019707, + "completed_at": 1787805784.72239, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1787803969.165207, + "completed_at": 1787804273.453507, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-checkout", + "started_at": 1787817227.244222, + "completed_at": 1787817230.600988, + "comments": [ + "Great work traversing the revision history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1787816516.11585, + "completed_at": 1787816519.555122, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1787817475.842094, + "completed_at": 1787817479.584296, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1787817621.955063, + "completed_at": 1787817625.307408, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1787732821.856758, + "completed_at": 1787732824.21787, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1787814405.194293, + "completed_at": 1787814408.662035, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1787815658.677754, + "completed_at": 1787815663.084467, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1787814618.732257, + "completed_at": 1787814622.295315, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1787731765.984245, + "completed_at": 1787731767.73003, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1787731988.172838, + "completed_at": 1787731990.640101, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "undo-init", + "started_at": 1787732245.074942, + "completed_at": 1787732248.276407, + "comments": [ + "You have successfully undone the init operation!" + ], + "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1787813076.143329, + "completed_at": 1787813079.785947, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" + } +] \ No newline at end of file From e43c37586983a0a993c17429219f4b368a26241b Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 12:51:43 +0800 Subject: [PATCH 02/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6afb0685f0..4538673ead 100644 --- a/progress.json +++ b/progress.json @@ -203,5 +203,14 @@ "Great work in viewing and understanding the diff of a specific commit!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1787892698.433261, + "completed_at": 1787892702.319883, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From c8fa29c82feb8eeaa40bb503cdc08bc4d96e1234 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 12:53:54 +0800 Subject: [PATCH 03/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4538673ead..cde214491b 100644 --- a/progress.json +++ b/progress.json @@ -212,5 +212,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1787892828.901786, + "completed_at": 1787892833.091547, + "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 fa1fcb8560b60aaffa0ffb418dd548083a565dab Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 12:57:22 +0800 Subject: [PATCH 04/22] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index cde214491b..15bee05f19 100644 --- a/progress.json +++ b/progress.json @@ -221,5 +221,15 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1787893034.655394, + "completed_at": 1787893040.941899, + "comments": [ + "Answer for Which numbers are present in stream-1 but not in stream-2? is empty.", + "Answer for Which numbers are present in stream-2 but not in stream-1? is empty." + ], + "status": "Incomplete" } ] \ No newline at end of file From a3db72b832961f5772f5778e8d8f2656e0453c95 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 12:58:23 +0800 Subject: [PATCH 05/22] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 15bee05f19..2c3933945f 100644 --- a/progress.json +++ b/progress.json @@ -231,5 +231,15 @@ "Answer for Which numbers are present in stream-2 but not in stream-1? is empty." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-compare", + "started_at": 1787893096.092141, + "completed_at": 1787893102.491025, + "comments": [ + "Answer for Which numbers are present in stream-1 but not in stream-2? is empty.", + "Answer for Which numbers are present in stream-2 but not in stream-1? is empty." + ], + "status": "Incomplete" } ] \ No newline at end of file From 89623fe73a86f44f9cc89f0c78bbf15c1de9a00e Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 12:58:59 +0800 Subject: [PATCH 06/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 2c3933945f..66a44b2dd8 100644 --- a/progress.json +++ b/progress.json @@ -241,5 +241,14 @@ "Answer for Which numbers are present in stream-2 but not in stream-1? is empty." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-compare", + "started_at": 1787893132.485118, + "completed_at": 1787893138.437135, + "comments": [ + "Cmd('git') failed due to: exit code(1)\n cmdline: git checkout stream-1\n stderr: 'error: Your local changes to the following files would be overwritten by checkout:\n\tdata.txt\nPlease commit your changes or stash them before you switch branches.\nAborting'" + ], + "status": "Error" } ] \ No newline at end of file From 2f10408bc4c4213b0d93febe32899265cac76b39 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:00:51 +0800 Subject: [PATCH 07/22] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 66a44b2dd8..cbcd309d31 100644 --- a/progress.json +++ b/progress.json @@ -250,5 +250,15 @@ "Cmd('git') failed due to: exit code(1)\n cmdline: git checkout stream-1\n stderr: 'error: Your local changes to the following files would be overwritten by checkout:\n\tdata.txt\nPlease commit your changes or stash them before you switch branches.\nAborting'" ], "status": "Error" + }, + { + "exercise_name": "branch-compare", + "started_at": 1787893244.263253, + "completed_at": 1787893251.042813, + "comments": [ + "Answer for Which numbers are present in stream-1 but not in stream-2? is empty.", + "Answer for Which numbers are present in stream-2 but not in stream-1? is empty." + ], + "status": "Incomplete" } ] \ No newline at end of file From d6c4c6941fef04192d856b6eae70c34b4998f31a Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:02:06 +0800 Subject: [PATCH 08/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index cbcd309d31..10155cfe8e 100644 --- a/progress.json +++ b/progress.json @@ -260,5 +260,14 @@ "Answer for Which numbers are present in stream-2 but not in stream-1? is empty." ], "status": "Incomplete" + }, + { + "exercise_name": "branch-compare", + "started_at": 1787893320.664998, + "completed_at": 1787893325.600721, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From 1f4cb3abf1ec261ded6f38cf089621418771cbe9 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:04:18 +0800 Subject: [PATCH 09/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 10155cfe8e..b33d87b30c 100644 --- a/progress.json +++ b/progress.json @@ -269,5 +269,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1787893453.554786, + "completed_at": 1787893457.391899, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From c6a7dfd5dc5e74bc0f12a2ceb02a676445c74c88 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:06:21 +0800 Subject: [PATCH 10/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b33d87b30c..3334b64831 100644 --- a/progress.json +++ b/progress.json @@ -278,5 +278,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1787893577.220402, + "completed_at": 1787893580.951482, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From 365139d11ae353b185a2b8a06029ccb8cd04f185 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:07:43 +0800 Subject: [PATCH 11/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3334b64831..6b26caad66 100644 --- a/progress.json +++ b/progress.json @@ -287,5 +287,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1787893659.166358, + "completed_at": 1787893662.976723, + "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 fe7b794bdfa0d66b705ce8a5a97f4fe11fa62dde Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:09:16 +0800 Subject: [PATCH 12/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6b26caad66..f48e6f03f8 100644 --- a/progress.json +++ b/progress.json @@ -296,5 +296,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1787893752.434281, + "completed_at": 1787893755.901116, + "comments": [ + "You have successfully undone the merge of branch 'others'." + ], + "status": "Completed" } ] \ No newline at end of file From 0e449e820530f28321cd80ab9a20cd214383104d Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:19:12 +0800 Subject: [PATCH 13/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f48e6f03f8..b4110d86f9 100644 --- a/progress.json +++ b/progress.json @@ -305,5 +305,14 @@ "You have successfully undone the merge of branch 'others'." ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1787894347.8517, + "completed_at": 1787894351.575666, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From c34dd4098d571854d60df27d39f81b1796d4892e Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:20:38 +0800 Subject: [PATCH 14/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b4110d86f9..b489522845 100644 --- a/progress.json +++ b/progress.json @@ -314,5 +314,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1787894433.684092, + "completed_at": 1787894437.247352, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 2ad252521ee8892c965e0b139583cd853940f65c Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:22:09 +0800 Subject: [PATCH 15/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b489522845..9027d904eb 100644 --- a/progress.json +++ b/progress.json @@ -323,5 +323,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1787894524.840669, + "completed_at": 1787894528.406306, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file From c96b1c65837f9a2df01bdd4b91288f0b7a8d7e04 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:25:03 +0800 Subject: [PATCH 16/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9027d904eb..e4804b9c50 100644 --- a/progress.json +++ b/progress.json @@ -332,5 +332,14 @@ "Great job using git branch to delete both merged and unmerged branches!" ], "status": "Completed" + }, + { + "exercise_name": "mix-messy-docs", + "started_at": 1787894698.135689, + "completed_at": 1787894702.199761, + "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 320c37005d12ce92b4b6ae1dfa30d2eb6afa5db3 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:28:21 +0800 Subject: [PATCH 17/22] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index e4804b9c50..b9d92e6b2a 100644 --- a/progress.json +++ b/progress.json @@ -341,5 +341,15 @@ "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": 1787894894.57216, + "completed_at": 1787894900.423149, + "comments": [ + "Branch 'feature-search' still exists.", + "Branch 'feature-delete' still exists." + ], + "status": "Incomplete" } ] \ No newline at end of file From 10e6dbc70f1691d093a3524ed65c9fea7ab7749f Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:29:06 +0800 Subject: [PATCH 18/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b9d92e6b2a..234f7b362e 100644 --- a/progress.json +++ b/progress.json @@ -351,5 +351,14 @@ "Branch 'feature-delete' still exists." ], "status": "Incomplete" + }, + { + "exercise_name": "mix-messy-graph", + "started_at": 1787894940.52403, + "completed_at": 1787894945.370839, + "comments": [ + "You have successfully completed the exercise!" + ], + "status": "Completed" } ] \ No newline at end of file From 8917ef9103b5ab9cfb0f0d5163f14ab943c12796 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:32:51 +0800 Subject: [PATCH 19/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 234f7b362e..75a3ab0c04 100644 --- a/progress.json +++ b/progress.json @@ -360,5 +360,14 @@ "You have successfully completed the exercise!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-push", + "started_at": 1787895166.812188, + "completed_at": 1787895170.451508, + "comments": [ + "Great work pushing the PQR branch to your fork!" + ], + "status": "Completed" } ] \ No newline at end of file From 6753e69a27f7e0d1025cc4855555f1b3f8e43f27 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:35:37 +0800 Subject: [PATCH 20/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 75a3ab0c04..e3c3488992 100644 --- a/progress.json +++ b/progress.json @@ -369,5 +369,14 @@ "Great work pushing the PQR branch to your fork!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-pull", + "started_at": 1787895332.564205, + "completed_at": 1787895336.449678, + "comments": [ + "Great work! All required branches are present and correctly set up." + ], + "status": "Completed" } ] \ No newline at end of file From b20de43e4884edcf3818c552443c4c8243e79730 Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:36:50 +0800 Subject: [PATCH 21/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e3c3488992..699a102f45 100644 --- a/progress.json +++ b/progress.json @@ -378,5 +378,14 @@ "Great work! All required branches are present and correctly set up." ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-delete", + "started_at": 1787895406.044947, + "completed_at": 1787895409.642412, + "comments": [ + "Great job deleting the VWX branch!" + ], + "status": "Completed" } ] \ No newline at end of file From ba3e4811bdcd892d0fd46baf171ec6e6cbb29a3b Mon Sep 17 00:00:00 2001 From: LUZIYUE Date: Fri, 28 Aug 2026 13:38:02 +0800 Subject: [PATCH 22/22] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 699a102f45..d3f82dfe7b 100644 --- a/progress.json +++ b/progress.json @@ -387,5 +387,14 @@ "Great job deleting the VWX branch!" ], "status": "Completed" + }, + { + "exercise_name": "glossary-branch-rename", + "started_at": 1787895476.864912, + "completed_at": 1787895481.684721, + "comments": [ + "Nice work renaming the branch locally and on the remote!" + ], + "status": "Completed" } ] \ No newline at end of file