From 691367d9a42865c5f4580dc8964cd55bb3eb055b Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 11:41:51 +0800 Subject: [PATCH 1/9] 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..911013fea --- /dev/null +++ b/progress.json @@ -0,0 +1,11 @@ +[ + { + "exercise_name": "side-track", + "started_at": 1756093309.030555, + "completed_at": 1756093309.844565, + "comments": [ + "Great work with using git branch and git checkout to fix the bugs!" + ], + "status": "Completed" + } +] \ No newline at end of file From 1a07ecae21f75c57696746708502756d7ffe5dd1 Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 11:53:06 +0800 Subject: [PATCH 2/9] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index 911013fea..dcffa5a48 100644 --- a/progress.json +++ b/progress.json @@ -7,5 +7,15 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756093985.411377, + "completed_at": 1756093985.943133, + "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 b4708c2ff9cd7c352ebc6e55d892225502fdd8bb Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 11:55:15 +0800 Subject: [PATCH 3/9] Update progress --- progress.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/progress.json b/progress.json index dcffa5a48..2de51a146 100644 --- a/progress.json +++ b/progress.json @@ -17,5 +17,15 @@ "Reset the repository using \"gitmastery progress reset\" and start again" ], "status": "Incomplete" + }, + { + "exercise_name": "branch-bender", + "started_at": 1756094113.187316, + "completed_at": 1756094113.74643, + "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 bac58296f2bafdf1e060854f2f2ed21f1e863829 Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 11:55:40 +0800 Subject: [PATCH 4/9] Reset progress for branch-bender --- progress.json | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/progress.json b/progress.json index 2de51a146..911013fea 100644 --- a/progress.json +++ b/progress.json @@ -7,25 +7,5 @@ "Great work with using git branch and git checkout to fix the bugs!" ], "status": "Completed" - }, - { - "exercise_name": "branch-bender", - "started_at": 1756093985.411377, - "completed_at": 1756093985.943133, - "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": 1756094113.187316, - "completed_at": 1756094113.74643, - "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 97a30200ffa96336de8c6e5d095db676eb386593 Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 11:56:24 +0800 Subject: [PATCH 5/9] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 911013fea..b3990dc7d 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": 1756094183.437181, + "completed_at": 1756094183.68338, + "comments": [ + "Great work with merging the branches in order! Try running the HTML files locally!" + ], + "status": "Completed" } ] \ No newline at end of file From 27c3508ce42c865f933e05f30f9bb7591b093dcb Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 12:12:06 +0800 Subject: [PATCH 6/9] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index b3990dc7d..ddbe4f030 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": 1756095125.507237, + "completed_at": 1756095125.972343, + "comments": [ + "You still have uncommitted changes. Commit them first on the appropriate branch first!" + ], + "status": "Incomplete" } ] \ No newline at end of file From 230d65949fed5403eb99076dcb6d33addaf7b973 Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 12:12:40 +0800 Subject: [PATCH 7/9] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index ddbe4f030..94d1cb0bb 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": 1756095159.586556, + "completed_at": 1756095159.781522, + "comments": [ + "Great work resolving the merge conflict!" + ], + "status": "Completed" } ] \ No newline at end of file From 2dc5179f6fc6f9f8e6ef1edf0bdc29ab5df68f5e Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 13:32:14 +0800 Subject: [PATCH 8/9] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 94d1cb0bb..3a73889d1 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": 1756099933.282911, + "completed_at": 1756099933.753177, + "comments": [ + "Great work with renaming the branches on your local repository!" + ], + "status": "Completed" } ] \ No newline at end of file From d98a8957c5d880d032120e2bb09dea7df0b32ad4 Mon Sep 17 00:00:00 2001 From: Jerrytys Date: Mon, 25 Aug 2025 13:34:47 +0800 Subject: [PATCH 9/9] Update progress --- progress.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/progress.json b/progress.json index 3a73889d1..47bbcb388 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": 1756100086.266264, + "completed_at": 1756100086.749464, + "comments": [ + "Great job using git branch to delete both merged and unmerged branches!" + ], + "status": "Completed" } ] \ No newline at end of file