From 283e7ceadb7ecb755d1528221745d1da7331211a Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Thu, 20 Aug 2026 14:18:44 +0800 Subject: [PATCH 01/13] Sync progress with local machine --- progress.json | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 0000000000..8c70b301ce --- /dev/null +++ b/progress.json @@ -0,0 +1,226 @@ +[ + { + "exercise_name": "clone-repo", + "started_at": 1786894976.961343, + "completed_at": 1786894980.035066, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1786896266.848336, + "completed_at": 1786896269.00668, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1786891821.653785, + "completed_at": 1786891827.236689, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1786366268.194385, + "completed_at": 1786366273.077646, + "comments": [ + "There are no new grocery list items added to the shopping list." + ], + "status": "Incomplete" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1786366346.226604, + "completed_at": 1786366348.962725, + "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": 1786780143.096795, + "completed_at": 1786780153.286975, + "comments": [ + "You are still ignoring many/file22.txt.", + "You are not ignoring runaway.txt. Find where the file is and fix that." + ], + "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1786780467.951799, + "completed_at": 1786780475.494192, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1786716165.822288, + "completed_at": 1786716167.46925, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" + }, + { + "exercise_name": "log-and-order", + "started_at": 1786430511.323449, + "completed_at": 1786430513.072734, + "comments": [], + "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1786717831.487948, + "completed_at": 1786717834.090488, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1786715338.853486, + "completed_at": 1786715465.444044, + "comments": [ + "That is not the right Github url!" + ], + "status": "Incomplete" + }, + { + "exercise_name": "remote-control", + "started_at": 1786715498.329818, + "completed_at": 1786715504.669004, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-checkout", + "started_at": 1786944026.693271, + "completed_at": 1786944028.423198, + "comments": [ + "Great work traversing the revision history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-diff", + "started_at": 1786939718.543285, + "completed_at": 1786939722.082961, + "comments": [ + "Great work comparing commits in git history!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-reset", + "started_at": 1786945624.855101, + "completed_at": 1786945626.70086, + "comments": [ + "You have reset the repository to the correct state!" + ], + "status": "Completed" + }, + { + "exercise_name": "sensors-revert", + "started_at": 1786950496.049815, + "completed_at": 1786950497.769224, + "comments": [ + "Good work reverting commits!" + ], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1786365410.79295, + "completed_at": 1786365413.512327, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "staging-intervention", + "started_at": 1786367302.028218, + "completed_at": 1786367304.806978, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-add", + "started_at": 1786935325.190158, + "completed_at": 1786935328.056468, + "comments": [ + "Great work using git tag to annotate various commits in the repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-push", + "started_at": 1786935861.554609, + "completed_at": 1786935865.343545, + "comments": [ + "Wonderful! You have successfully synced the local tags with the remote tags!" + ], + "status": "Completed" + }, + { + "exercise_name": "tags-update", + "started_at": 1786935472.128439, + "completed_at": 1786935474.674165, + "comments": [ + "Great work! You have successfully updated the tags to point to the correct commits." + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1786363267.812592, + "completed_at": 1786363270.18927, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1786363306.336167, + "completed_at": 1786363309.265709, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + }, + { + "exercise_name": "undo-init", + "started_at": 1786363707.669588, + "completed_at": 1786363710.346287, + "comments": [ + "You have successfully undone the init operation!" + ], + "status": "Completed" + }, + { + "exercise_name": "view-commits", + "started_at": 1786934479.109211, + "completed_at": 1786934481.805307, + "comments": [ + "Great work in viewing and understanding the diff of a specific commit!" + ], + "status": "Completed" + } +] \ No newline at end of file From 671968cdf40fd583b72dde2956565ec694c10a7f Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Thu, 20 Aug 2026 17:30:37 +0800 Subject: [PATCH 02/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8c70b301ce..0eb4f012c5 100644 --- a/progress.json +++ b/progress.json @@ -222,5 +222,14 @@ "Great work in viewing and understanding the diff of a specific commit!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1787218232.875468, + "completed_at": 1787218236.314835, + "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 69072a56ab5fde5d9583b17a6d426ff77328cc8b Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Thu, 20 Aug 2026 17:30:59 +0800 Subject: [PATCH 03/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 0eb4f012c5..dbeee7a7b0 100644 --- a/progress.json +++ b/progress.json @@ -231,5 +231,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1787218256.6895, + "completed_at": 1787218258.598603, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From b933d5eeb461d2ca7537f1ddea3f399fb30391da Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Thu, 20 Aug 2026 17:34:58 +0800 Subject: [PATCH 04/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index dbeee7a7b0..67f4666178 100644 --- a/progress.json +++ b/progress.json @@ -240,5 +240,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-previous", + "started_at": 1787218496.227542, + "completed_at": 1787218498.032776, + "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 bd98fc7a3a758ab922e02cace081daa482a556f6 Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Thu, 20 Aug 2026 17:57:26 +0800 Subject: [PATCH 05/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 67f4666178..b0adc949a3 100644 --- a/progress.json +++ b/progress.json @@ -249,5 +249,14 @@ "Excellent work! You've successfully created branches from a previous commit and explored alternative storylines!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1787219844.661239, + "completed_at": 1787219846.287929, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 05551800de1aa88e83056356a60bccd6edf93d47 Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Thu, 20 Aug 2026 23:46:38 +0800 Subject: [PATCH 06/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b0adc949a3..11190bafe1 100644 --- a/progress.json +++ b/progress.json @@ -258,5 +258,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "branch-forward", + "started_at": 1787240796.253009, + "completed_at": 1787240797.927989, + "comments": [ + "Great job fast-forward merging only 'with-sally'!" + ], + "status": "Completed" } ] \ No newline at end of file From bf1d0534146f8b134d3e02f6a17c705409d21393 Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Fri, 21 Aug 2026 00:12:11 +0800 Subject: [PATCH 07/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 11190bafe1..8579912e60 100644 --- a/progress.json +++ b/progress.json @@ -267,5 +267,14 @@ "Great job fast-forward merging only 'with-sally'!" ], "status": "Completed" + }, + { + "exercise_name": "merge-undo", + "started_at": 1787242328.250513, + "completed_at": 1787242329.94637, + "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 4a23811f344f7f468705031c37f2ab86964cdff9 Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Fri, 21 Aug 2026 00:14:03 +0800 Subject: [PATCH 08/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8579912e60..4031b397b7 100644 --- a/progress.json +++ b/progress.json @@ -276,5 +276,14 @@ "Great work with undoing the merges! Try listing the directory to see what has changed." ], "status": "Completed" + }, + { + "exercise_name": "ff-undo", + "started_at": 1787242441.643259, + "completed_at": 1787242443.430376, + "comments": [ + "You have successfully undone the merge of branch 'others'." + ], + "status": "Completed" } ] \ No newline at end of file From 653fda3c32d6f94e5e34b0e73b1c3440fa387f88 Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Fri, 21 Aug 2026 00:26:52 +0800 Subject: [PATCH 09/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4031b397b7..e55a88bf2f 100644 --- a/progress.json +++ b/progress.json @@ -285,5 +285,14 @@ "You have successfully undone the merge of branch 'others'." ], "status": "Completed" + }, + { + "exercise_name": "branch-compare", + "started_at": 1787243209.768449, + "completed_at": 1787243211.839155, + "comments": [ + "Great work comparing the branches successfully!" + ], + "status": "Completed" } ] \ No newline at end of file From d2b3e4d21a307accf70c8c0d136dba0ba9ca5ab4 Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Fri, 21 Aug 2026 00:30:33 +0800 Subject: [PATCH 10/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index e55a88bf2f..eb7941dd52 100644 --- a/progress.json +++ b/progress.json @@ -294,5 +294,14 @@ "Great work comparing the branches successfully!" ], "status": "Completed" + }, + { + "exercise_name": "merge-squash", + "started_at": 1787243431.315246, + "completed_at": 1787243433.212345, + "comments": [ + "Good job performing a merge squash!" + ], + "status": "Completed" } ] \ No newline at end of file From b9357e129895a63e6481357d3281c731258cd1e0 Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Fri, 21 Aug 2026 13:41:27 +0800 Subject: [PATCH 11/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index eb7941dd52..906ea57361 100644 --- a/progress.json +++ b/progress.json @@ -303,5 +303,14 @@ "Good job performing a merge squash!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1787290884.26751, + "completed_at": 1787290886.903894, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From a2826ab864728dabbcff63ed8d2d7764f90aecfa Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Fri, 21 Aug 2026 13:47:32 +0800 Subject: [PATCH 12/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 906ea57361..1f6cadb0db 100644 --- a/progress.json +++ b/progress.json @@ -312,5 +312,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1787291249.590937, + "completed_at": 1787291252.031364, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 3124678210e70da1a0e7b6125e14749f543a9763 Mon Sep 17 00:00:00 2001 From: sammeowwww Date: Fri, 21 Aug 2026 13:54:54 +0800 Subject: [PATCH 13/13] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 1f6cadb0db..ed24cf9ae3 100644 --- a/progress.json +++ b/progress.json @@ -321,5 +321,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1787291691.158286, + "completed_at": 1787291693.681146, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file