From a024bcc2e734d3f3d20cafddf9859ada9e086a1d Mon Sep 17 00:00:00 2001 From: Josh Loh Date: Mon, 25 Aug 2025 02:58:10 +0800 Subject: [PATCH 1/5] 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 000000000..28596fe3f --- /dev/null +++ b/progress.json @@ -0,0 +1,11 @@ +[ + { + "exercise_name": "side-track", + "started_at": 1756061888.750111, + "completed_at": 1756061889.401604, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" + } +] \ No newline at end of file From cb60618bd443d3630de3963d4c2d7dc0120a5003 Mon Sep 17 00:00:00 2001 From: Josh Loh Date: Mon, 25 Aug 2025 03:20:02 +0800 Subject: [PATCH 2/5] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 28596fe3f..c394605a9 100644 --- a/progress.json +++ b/progress.json @@ -7,5 +7,14 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756063201.125921, + "completed_at": 1756063201.559076, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 03bf8329145c4034afb0ce9e17adb5b2f90952e2 Mon Sep 17 00:00:00 2001 From: Josh Loh Date: Mon, 25 Aug 2025 03:31:52 +0800 Subject: [PATCH 3/5] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index c394605a9..765a8ec8c 100644 --- a/progress.json +++ b/progress.json @@ -16,5 +16,14 @@ "Great work with merging the branches in order! Try running the HTML files locally!" ], "status": "Completed" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1756063911.660698, + "completed_at": 1756063912.151823, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 28db351a3403461cab256f58285cf06fb66ea1f6 Mon Sep 17 00:00:00 2001 From: Josh Loh Date: Mon, 25 Aug 2025 03:39:32 +0800 Subject: [PATCH 4/5] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 765a8ec8c..94ef31c16 100644 --- a/progress.json +++ b/progress.json @@ -25,5 +25,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1756064371.840565, + "completed_at": 1756064372.366143, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From b7fed00048cde9df5e16a61de13dab12f5e39375 Mon Sep 17 00:00:00 2001 From: Josh Loh Date: Mon, 25 Aug 2025 03:59:57 +0800 Subject: [PATCH 5/5] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 94ef31c16..ea17df32e 100644 --- a/progress.json +++ b/progress.json @@ -34,5 +34,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1756065596.146867, + "completed_at": 1756065596.640702, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file