From 2b0598f482d7bd3656ad78a927b1730f7a5b71a9 Mon Sep 17 00:00:00 2001 From: minwaiphyo Date: Thu, 29 Jan 2026 20:38:29 +0800 Subject: [PATCH 1/6] 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..63844d7bf --- /dev/null +++ b/progress.json @@ -0,0 +1,11 @@ +[ + { + "exercise_name": "side-track", + "started_at": 1769690304.780848, + "completed_at": 1769690307.805161, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" + } +] \ No newline at end of file From bdb14d3a18ce1fe8db482d798ba7755f246f68bb Mon Sep 17 00:00:00 2001 From: minwaiphyo Date: Thu, 29 Jan 2026 21:05:49 +0800 Subject: [PATCH 2/6] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 63844d7bf..09e919463 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": 1769691944.862964, + "completed_at": 1769691948.377887, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From b4971fed4dd38756a664e1253ed9a827583a6373 Mon Sep 17 00:00:00 2001 From: minwaiphyo Date: Thu, 29 Jan 2026 22:21:09 +0800 Subject: [PATCH 3/6] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 09e919463..cb5dc0870 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": 1769696463.97368, + "completed_at": 1769696468.897788, + "comments": [ + "You still have uncommitted changes. Commit them first on the appropriate branch first!" + ], + "status": "Incomplete" } ] \ No newline at end of file From a04b9c74404b3c2635f830842e7be94e6802e7f7 Mon Sep 17 00:00:00 2001 From: minwaiphyo Date: Thu, 29 Jan 2026 22:21:35 +0800 Subject: [PATCH 4/6] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index cb5dc0870..868e8e191 100644 --- a/progress.json +++ b/progress.json @@ -25,5 +25,14 @@ "You still have uncommitted changes. Commit them first on the appropriate branch first!" ], "status": "Incomplete" + }, + { + "exercise_name": "conflict-mediator", + "started_at": 1769696490.326327, + "completed_at": 1769696494.192477, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From bc6a548d8ce385ded981fb44450941399741cb26 Mon Sep 17 00:00:00 2001 From: minwaiphyo Date: Thu, 29 Jan 2026 22:26:55 +0800 Subject: [PATCH 5/6] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 868e8e191..dadd78696 100644 --- a/progress.json +++ b/progress.json @@ -34,5 +34,14 @@ "Great work resolving the merge conflict!" ], "status": "Completed" + }, + { + "exercise_name": "branch-rename", + "started_at": 1769696810.887937, + "completed_at": 1769696813.842805, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From 6717a3ffc6e3c56a516a370046b608bee7c3bb92 Mon Sep 17 00:00:00 2001 From: minwaiphyo Date: Thu, 29 Jan 2026 22:41:30 +0800 Subject: [PATCH 6/6] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index dadd78696..605244ecd 100644 --- a/progress.json +++ b/progress.json @@ -43,5 +43,14 @@ "Great work with renaming the branches on your local repository!" ], "status": "Completed" + }, + { + "exercise_name": "branch-delete", + "started_at": 1769697686.406614, + "completed_at": 1769697689.584665, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file