From 24bab45d1ad207d34ac7d09878726ec92cd5a3ff Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 14:40:35 +0800 Subject: [PATCH 01/27] Sync progress with local machine --- progress.json | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 progress.json diff --git a/progress.json b/progress.json new file mode 100644 index 000000000..98cb8260f --- /dev/null +++ b/progress.json @@ -0,0 +1,56 @@ +[ + { + "exercise_name": "grocery-shopping", + "started_at": 1755255270.910603, + "completed_at": 1755255271.353926, + "comments": [ + "All commits are empty." + ], + "status": "Incomplete" + }, + { + "exercise_name": "grocery-shopping", + "started_at": 1755255472.295688, + "completed_at": 1755255473.016182, + "comments": [ + "Great work! You have successfully used `git add` and `git commit` to modify the shopping list! Keep it up!" + ], + "status": "Completed" + }, + { + "exercise_name": "stage-fright", + "started_at": 1755254862.525478, + "completed_at": 1755254862.935485, + "comments": [ + "Great work! You have successfully checked in all the actors!" + ], + "status": "Completed" + }, + { + "exercise_name": "staging-intervention", + "started_at": 1755254978.967987, + "completed_at": 1755254979.398277, + "comments": [ + "Great work! You have successfully fixed the attendance system!" + ], + "status": "Completed" + }, + { + "exercise_name": "under-control", + "started_at": 1755252466.876758, + "completed_at": 1755252466.886114, + "comments": [ + "Exercise is not a Git repository" + ], + "status": "Error" + }, + { + "exercise_name": "under-control", + "started_at": 1755252509.921751, + "completed_at": 1755252510.232175, + "comments": [ + "You successfully used git init to initialize this folder as a Git repository!" + ], + "status": "Completed" + } +] \ No newline at end of file From 8cfdbf40927f3f22c643c254110223c5358b5ca9 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 15:17:04 +0800 Subject: [PATCH 02/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 98cb8260f..9b3b55296 100644 --- a/progress.json +++ b/progress.json @@ -52,5 +52,14 @@ "You successfully used git init to initialize this folder as a Git repository!" ], "status": "Completed" + }, + { + "exercise_name": "remote-control", + "started_at": 1755933411.859965, + "completed_at": 1755933423.853147, + "comments": [ + "That is not the right Github url!" + ], + "status": "Incomplete" } ] \ No newline at end of file From aa4b7ab8b1ad33bb7c47648d48f3d471063b3602 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 15:19:12 +0800 Subject: [PATCH 03/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 9b3b55296..b4d1f81a1 100644 --- a/progress.json +++ b/progress.json @@ -61,5 +61,14 @@ "That is not the right Github url!" ], "status": "Incomplete" + }, + { + "exercise_name": "remote-control", + "started_at": 1755933546.454004, + "completed_at": 1755933551.167116, + "comments": [ + "That is not the right Github url!" + ], + "status": "Incomplete" } ] \ No newline at end of file From cfc409e4c880a31f76e586294e6757aef94e0e6d Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 15:19:48 +0800 Subject: [PATCH 04/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b4d1f81a1..f8b62c9f7 100644 --- a/progress.json +++ b/progress.json @@ -70,5 +70,14 @@ "That is not the right Github url!" ], "status": "Incomplete" + }, + { + "exercise_name": "remote-control", + "started_at": 1755933582.814269, + "completed_at": 1755933588.035908, + "comments": [ + "Great work setting up a public remote repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 466b9dd1386b2672548321aed6116eb973ff498c Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 15:29:12 +0800 Subject: [PATCH 05/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f8b62c9f7..4ed28fc00 100644 --- a/progress.json +++ b/progress.json @@ -79,5 +79,14 @@ "Great work setting up a public remote repository!" ], "status": "Completed" + }, + { + "exercise_name": "link-me", + "started_at": 1755934150.900941, + "completed_at": 1755934151.248767, + "comments": [ + "Great work with using git remote to add an upstream remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 1efbd2f7fe4e7c7adb8dd38a0fc52752056a50fb Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 15:35:52 +0800 Subject: [PATCH 06/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 4ed28fc00..6d146926a 100644 --- a/progress.json +++ b/progress.json @@ -88,5 +88,14 @@ "Great work with using git remote to add an upstream remote!" ], "status": "Completed" + }, + { + "exercise_name": "push-over", + "started_at": 1755934551.378841, + "completed_at": 1755934551.844953, + "comments": [ + "You should have made a separate commit!" + ], + "status": "Incomplete" } ] \ No newline at end of file From c2f1a4533d380f42f24cda5e149d103f3b172a87 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 15:37:16 +0800 Subject: [PATCH 07/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6d146926a..63ad3ae07 100644 --- a/progress.json +++ b/progress.json @@ -97,5 +97,14 @@ "You should have made a separate commit!" ], "status": "Incomplete" + }, + { + "exercise_name": "push-over", + "started_at": 1755934635.755454, + "completed_at": 1755934635.899339, + "comments": [ + "You should have made a separate commit!" + ], + "status": "Incomplete" } ] \ No newline at end of file From daad9d1c4a9d385d475e6d804aad88436ade5172 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 15:40:13 +0800 Subject: [PATCH 08/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 63ad3ae07..768ae2aa1 100644 --- a/progress.json +++ b/progress.json @@ -106,5 +106,14 @@ "You should have made a separate commit!" ], "status": "Incomplete" + }, + { + "exercise_name": "push-over", + "started_at": 1755934810.855849, + "completed_at": 1755934812.559925, + "comments": [ + "Great work pushing changes to the remote!" + ], + "status": "Completed" } ] \ No newline at end of file From 5eb4f264458c38e082dfb2eb1a268c94f2551ee2 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 18:00:33 +0800 Subject: [PATCH 09/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 768ae2aa1..99db09577 100644 --- a/progress.json +++ b/progress.json @@ -115,5 +115,14 @@ "Great work pushing changes to the remote!" ], "status": "Completed" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755943226.408367, + "completed_at": 1755943232.497835, + "comments": [ + "You are still ignoring many/file22.txt." + ], + "status": "Incomplete" } ] \ No newline at end of file From d2f69160a59fddd205ffecf790f41d3071889463 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 18:01:18 +0800 Subject: [PATCH 10/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 99db09577..8fa6defe6 100644 --- a/progress.json +++ b/progress.json @@ -124,5 +124,14 @@ "You are still ignoring many/file22.txt." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755943272.128709, + "completed_at": 1755943277.497656, + "comments": [ + "You are still ignoring many/file22.txt." + ], + "status": "Incomplete" } ] \ No newline at end of file From 35953217c22ac6594911e7b199991dc0c6f4a243 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 18:02:03 +0800 Subject: [PATCH 11/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 8fa6defe6..d8f77efe1 100644 --- a/progress.json +++ b/progress.json @@ -133,5 +133,14 @@ "You are still ignoring many/file22.txt." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755943316.507044, + "completed_at": 1755943322.714673, + "comments": [ + "You are still ignoring many/file22.txt." + ], + "status": "Incomplete" } ] \ No newline at end of file From 2868a8a6b7627d587d44ac2e47aedab14f3c7021 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 18:02:41 +0800 Subject: [PATCH 12/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index d8f77efe1..6cffed650 100644 --- a/progress.json +++ b/progress.json @@ -142,5 +142,14 @@ "You are still ignoring many/file22.txt." ], "status": "Incomplete" + }, + { + "exercise_name": "ignoring-somethings", + "started_at": 1755943354.304688, + "completed_at": 1755943360.46099, + "comments": [ + "Great work using .gitignore!" + ], + "status": "Completed" } ] \ No newline at end of file From f99c1185e1776e1071c3af88898de4496221d14b Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 18:04:44 +0800 Subject: [PATCH 13/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6cffed650..802c0887b 100644 --- a/progress.json +++ b/progress.json @@ -151,5 +151,14 @@ "Great work using .gitignore!" ], "status": "Completed" + }, + { + "exercise_name": "fork-repo", + "started_at": 1755943481.989587, + "completed_at": 1755943484.120603, + "comments": [ + "Great work creating a fork with Github!" + ], + "status": "Completed" } ] \ No newline at end of file From 885651b91df33c64a6b178543aa93dfb2adaef6b Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 18:08:48 +0800 Subject: [PATCH 14/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 802c0887b..f20203f93 100644 --- a/progress.json +++ b/progress.json @@ -160,5 +160,14 @@ "Great work creating a fork with Github!" ], "status": "Completed" + }, + { + "exercise_name": "clone-repo", + "started_at": 1755943725.792478, + "completed_at": 1755943728.169156, + "comments": [ + "Great work creating a clone of a fork from Github!" + ], + "status": "Completed" } ] \ No newline at end of file From b85ea46ab51588304753a9dacdc4e122df16efdd Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sat, 23 Aug 2025 18:18:18 +0800 Subject: [PATCH 15/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f20203f93..7d5f3aca9 100644 --- a/progress.json +++ b/progress.json @@ -169,5 +169,14 @@ "Great work creating a clone of a fork from Github!" ], "status": "Completed" + }, + { + "exercise_name": "fetch-and-pull", + "started_at": 1755944297.694272, + "completed_at": 1755944298.165223, + "comments": [ + "Great work fetching and pulling different upstreams!" + ], + "status": "Completed" } ] \ No newline at end of file From 9371c1252c4786740cd262ed29e9ec880187ac02 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sun, 24 Aug 2025 18:46:22 +0800 Subject: [PATCH 16/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 7d5f3aca9..f5b8d3265 100644 --- a/progress.json +++ b/progress.json @@ -178,5 +178,14 @@ "Great work fetching and pulling different upstreams!" ], "status": "Completed" + }, + { + "exercise_name": "side-track", + "started_at": 1756032380.042438, + "completed_at": 1756032380.678334, + "comments": [ + "You still have uncommitted changes. Commit them first on the appropriate branch first!" + ], + "status": "Incomplete" } ] \ No newline at end of file From c14e5b3360c84e2c1713cd02dcd063b082711107 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sun, 24 Aug 2025 18:47:08 +0800 Subject: [PATCH 17/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f5b8d3265..f46af4297 100644 --- a/progress.json +++ b/progress.json @@ -187,5 +187,14 @@ "You still have uncommitted changes. Commit them first on the appropriate branch first!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1756032427.584131, + "completed_at": 1756032428.059159, + "comments": [ + "You do not have 2 commits on the bug-fix branch" + ], + "status": "Incomplete" } ] \ No newline at end of file From 9b7ddb315111b43155dc30b7bfe2d5f06b5882f2 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sun, 24 Aug 2025 18:49:03 +0800 Subject: [PATCH 18/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index f46af4297..3ef27bec2 100644 --- a/progress.json +++ b/progress.json @@ -196,5 +196,14 @@ "You do not have 2 commits on the bug-fix branch" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1756032542.924499, + "completed_at": 1756032543.201617, + "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 6f22aedb043e050e79664dc8eb5e59fc9f68bfb1 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Sun, 24 Aug 2025 18:49:15 +0800 Subject: [PATCH 19/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3ef27bec2..ec8b832a0 100644 --- a/progress.json +++ b/progress.json @@ -205,5 +205,14 @@ "You aren't currently on the main branch. Checkout to that branch and try again!" ], "status": "Incomplete" + }, + { + "exercise_name": "side-track", + "started_at": 1756032554.164233, + "completed_at": 1756032554.586477, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" } ] \ No newline at end of file From c1c1398dcd0986b38e32276885ae91c71200ffc4 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Mon, 25 Aug 2025 16:11:37 +0800 Subject: [PATCH 20/27] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index ec8b832a0..a300c410b 100644 --- a/progress.json +++ b/progress.json @@ -214,5 +214,15 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756109495.198948, + "completed_at": 1756109495.843441, + "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 9f42f8da4fe7a0a17c2e55e645df0aabae08f4e4 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Mon, 25 Aug 2025 23:15:31 +0800 Subject: [PATCH 21/27] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index a300c410b..3871baf4d 100644 --- a/progress.json +++ b/progress.json @@ -224,5 +224,15 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756134930.067914, + "completed_at": 1756134930.552806, + "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 f917f87e5bcbfcdf0f728ce6d86f13ec11cf0bf2 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Mon, 25 Aug 2025 23:19:34 +0800 Subject: [PATCH 22/27] Reset progress for branch-bender --- progress.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/progress.json b/progress.json index 3871baf4d..ec8b832a0 100644 --- a/progress.json +++ b/progress.json @@ -214,25 +214,5 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" - }, - { - "exercise_name": "branch-bender", - "started_at": 1756109495.198948, - "completed_at": 1756109495.843441, - "comments": [ - "You cannot use fast forwarding on feature/login when merging.", - "Reset the repository using \"gitmastery progress reset\" and start again" - ], - "status": "Incomplete" - }, - { - "exercise_name": "branch-bender", - "started_at": 1756134930.067914, - "completed_at": 1756134930.552806, - "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 5d2dfcf93e6b77f5303be25a0c77c1453bc012ee Mon Sep 17 00:00:00 2001 From: nghaowei Date: Mon, 25 Aug 2025 23:20:22 +0800 Subject: [PATCH 23/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ec8b832a0..a7ddb05e0 100644 --- a/progress.json +++ b/progress.json @@ -214,5 +214,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756135221.318172, + "completed_at": 1756135221.900525, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From c84256ef392de6595563a96a53b5bce9d0a7fec4 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Mon, 25 Aug 2025 23:28:04 +0800 Subject: [PATCH 24/27] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index a7ddb05e0..a2cdceb98 100644 --- a/progress.json +++ b/progress.json @@ -223,5 +223,15 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1756135683.438177, + "completed_at": 1756135683.876815, + "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 d161d5876734989d34dfe9586a70f8ef657a2942 Mon Sep 17 00:00:00 2001 From: nghaowei Date: Mon, 25 Aug 2025 23:29:08 +0800 Subject: [PATCH 25/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index a2cdceb98..ca4f55aa6 100644 --- a/progress.json +++ b/progress.json @@ -233,5 +233,14 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1756135747.130076, + "completed_at": 1756135747.266662, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From f34660151d8753f18e5d35f67ebc952aed52479b Mon Sep 17 00:00:00 2001 From: nghaowei Date: Tue, 26 Aug 2025 16:03:25 +0800 Subject: [PATCH 26/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ca4f55aa6..6a877a1f7 100644 --- a/progress.json +++ b/progress.json @@ -242,5 +242,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1756195403.86963, + "completed_at": 1756195404.352858, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 276c2c4b896ea6d6c285ac5df80fa979f176dafa Mon Sep 17 00:00:00 2001 From: nghaowei Date: Tue, 26 Aug 2025 16:13:24 +0800 Subject: [PATCH 27/27] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 6a877a1f7..0ad79382c 100644 --- a/progress.json +++ b/progress.json @@ -251,5 +251,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1756196002.76434, + "completed_at": 1756196003.229403, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file