From 5fe41b0b78817fd43504085f4483aaa0a602ba96 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sat, 6 Sep 2025 01:39:56 -0700 Subject: [PATCH 01/13] [WIP] # Clone if you haven't already git clone https://github.com/02ez/mcino-Introduction-to-Git-and-GitHub.git cd mcino-Introduction-to-Git-and-GitHub # Execute all Part 2 tasks git checkout -b bug-fix-typo sed -i 's/2022 XYZ, Inc./2023 XYZ, Inc./g' README... (#2) * Initial plan * Complete Part 2 Git workflow: typo fix, merge, and revert branches Co-authored-by: 02ez <226986020+02ez@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: 02ez <226986020+02ez@users.noreply.github.com> --- merge_branches.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 merge_branches.txt diff --git a/merge_branches.txt b/merge_branches.txt new file mode 100644 index 0000000..2956d39 --- /dev/null +++ b/merge_branches.txt @@ -0,0 +1,5 @@ +Branch: main +1310ce7 Merge branch 'bug-fix-typo' +5471283 fix: update copyright year to 2023 +9e3c8d4 Initial plan +ad95b0a Create close_pr.yml From 8d8682b4d56081685ee5bcd7673301938b8b7039 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sat, 6 Sep 2025 02:41:01 -0700 Subject: [PATCH 02/13] Implement complete Git workflow: branch creation, merge, and revert operations (#3) * Initial plan * Implement copyright update workflow - create branch, update year to 2023, merge to main Co-authored-by: 02ez <226986020+02ez@users.noreply.github.com> * Update merge_branches.txt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: 02ez <226986020+02ez@users.noreply.github.com> Co-authored-by: Tyler McDaniel Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- merge_branches.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/merge_branches.txt b/merge_branches.txt index 2956d39..8c85fd9 100644 --- a/merge_branches.txt +++ b/merge_branches.txt @@ -1,5 +1,5 @@ Branch: main -1310ce7 Merge branch 'bug-fix-typo' -5471283 fix: update copyright year to 2023 -9e3c8d4 Initial plan -ad95b0a Create close_pr.yml +48d3290 Merge branch 'bug-fix-typo' +cabf94a fix: update copyright year to 2023 +1d33e2a Initial plan +5fe41b0 Add setup instructions for cloning the repository From b6b2ab72afa3e8079d671011d63ee5bef7a094e8 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sat, 6 Sep 2025 02:41:38 -0700 Subject: [PATCH 03/13] [WIP] # Clone your fork git clone https://github.com/02ez/mcino-Introduction-to-Git-and-GitHub.git cd mcino-Introduction-to-Git-and-GitHub # Fix typo branch git checkout -b bug-fix-typo sed -i 's/2022 XYZ, Inc./2023 XYZ, Inc./g' README.md git add README.md ... (#1) * Initial plan * Complete Git workflow: fix typo, merge, and revert changes Co-authored-by: 02ez <226986020+02ez@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: 02ez <226986020+02ez@users.noreply.github.com> Co-authored-by: Tyler McDaniel --- merge_branches.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/merge_branches.txt b/merge_branches.txt index 8c85fd9..e69de29 100644 --- a/merge_branches.txt +++ b/merge_branches.txt @@ -1,5 +0,0 @@ -Branch: main -48d3290 Merge branch 'bug-fix-typo' -cabf94a fix: update copyright year to 2023 -1d33e2a Initial plan -5fe41b0 Add setup instructions for cloning the repository From 037176261444833d8ca82040c2fcd9751bfedcde Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Sat, 6 Sep 2025 02:42:00 -0700 Subject: [PATCH 04/13] Initial plan (#4) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> From 4f2c1128dce8b6fc4854173ab56c522ed38770cd Mon Sep 17 00:00:00 2001 From: Tyler McDaniel Date: Sat, 6 Sep 2025 03:13:37 -0700 Subject: [PATCH 05/13] Update copyright year in README.md (#5) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b103466..2a2b1d7 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Output simple interest = p*t*r ``` -_© 2022 XYZ, Inc._ +_© 2023 XYZ, Inc._ From 4785e980ec9259940ecad2efe062cee8d423a3d6 Mon Sep 17 00:00:00 2001 From: Tyler McDaniel Date: Sat, 6 Sep 2025 03:28:19 -0700 Subject: [PATCH 06/13] revert: restore copyright to 2022 (#7) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a2b1d7..b103466 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Output simple interest = p*t*r ``` -_© 2023 XYZ, Inc._ +_© 2022 XYZ, Inc._ From 3c3c2f6271a6c9e6a558cab8ae482ce106e06b8d Mon Sep 17 00:00:00 2001 From: Tyler McDaniel Date: Sat, 6 Sep 2025 03:31:28 -0700 Subject: [PATCH 07/13] Revert "revert: restore copyright to 2022 (#7)" (#8) This reverts commit 4785e980ec9259940ecad2efe062cee8d423a3d6. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b103466..2a2b1d7 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Output simple interest = p*t*r ``` -_© 2022 XYZ, Inc._ +_© 2023 XYZ, Inc._ From c4c0deaaaff2fe51f256c67a0e9a71f352dea503 Mon Sep 17 00:00:00 2001 From: Tyler McDaniel Date: Sat, 6 Sep 2025 03:36:09 -0700 Subject: [PATCH 08/13] Revert "revert: restore copyright to 2022 (#7)" (#9) This reverts commit 4785e980ec9259940ecad2efe062cee8d423a3d6. From 80326ddd6127d97ab11a102773db9ef7f4537485 Mon Sep 17 00:00:00 2001 From: GJAMES007 Date: Mon, 8 Sep 2025 10:04:35 -0400 Subject: [PATCH 09/13] Change the footer in the main README.md file from 2023 to 2022 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a2b1d7..b103466 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Output simple interest = p*t*r ``` -_© 2023 XYZ, Inc._ +_© 2022 XYZ, Inc._ From 70b45828d5ffe8680a713720e8e9cd5235bb07ed Mon Sep 17 00:00:00 2001 From: GJAMES007 Date: Mon, 8 Sep 2025 10:27:00 -0400 Subject: [PATCH 10/13] Change the footer in the main README.md file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b103466..2a2b1d7 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Output simple interest = p*t*r ``` -_© 2022 XYZ, Inc._ +_© 2023 XYZ, Inc._ From f3f37d244d8805555593896b7e626bd918eab223 Mon Sep 17 00:00:00 2001 From: GJAMES007 Date: Mon, 8 Sep 2025 10:30:17 -0400 Subject: [PATCH 11/13] Revert "Change the footer in the main README.md file" This reverts commit 70b45828d5ffe8680a713720e8e9cd5235bb07ed. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a2b1d7..b103466 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Output simple interest = p*t*r ``` -_© 2023 XYZ, Inc._ +_© 2022 XYZ, Inc._ From 23153f388b6e3dc187b0678fe485016c8f26569f Mon Sep 17 00:00:00 2001 From: GJAMES007 Date: Mon, 8 Sep 2025 12:12:37 -0400 Subject: [PATCH 12/13] Changed the year from 2022 to 2023 in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b103466..2a2b1d7 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Output simple interest = p*t*r ``` -_© 2022 XYZ, Inc._ +_© 2023 XYZ, Inc._ From 08d1b4d458c6ac0305931d21bb35cd093c99e84c Mon Sep 17 00:00:00 2001 From: GJAMES007 Date: Mon, 8 Sep 2025 12:33:59 -0400 Subject: [PATCH 13/13] Revert "Changed the year from 2022 to 2023 in README.md" This reverts commit 23153f388b6e3dc187b0678fe485016c8f26569f. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a2b1d7..b103466 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Output simple interest = p*t*r ``` -_© 2023 XYZ, Inc._ +_© 2022 XYZ, Inc._