From 4c4b866483789e31de7c8c261a4982d982362d02 Mon Sep 17 00:00:00 2001 From: preshy-lael Date: Mon, 17 Jun 2024 04:38:01 -0700 Subject: [PATCH 1/6] Added some changes to charlie --- CHARLIE.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 CHARLIE.md diff --git a/CHARLIE.md b/CHARLIE.md new file mode 100644 index 0000000..5b33d58 --- /dev/null +++ b/CHARLIE.md @@ -0,0 +1,13 @@ +These GitHub beginner exercises for a treasure hunt involve tasks aimed at teaching teams fundamental Git and GitHub operations: + +Initializing a Repository: Teams clone a repository, create a README file, commit it, and push changes to their team's branch. + +Collaborating on a Secret Code: Teams fork a repository, create a new branch, make changes to a decoding guide, commit, push, and create a pull request for review. + +Tracking Changes in Manuscripts: Teams add multiple versions of an ancient manuscript to the repository, commit each version with relevant messages, and view the commit history. + +Resolving Conflicts in Expedition Notes: Teams fetch updates, merge them into their local branch, resolve conflicts if any, commit the changes, and push the final version to GitHub. + +Reverting Changes in Artifact Documentation: Teams identify a commit with correct documentation, revert to that commit, and push the changes to GitHub. + +These exercises are designed to simulate real-world scenarios, helping teams practice essential Git commands like clone, branch, commit, push, fetch, merge, revert, and view commit history. \ No newline at end of file From 878620fc9f92e585ccb09e0bef157f13788a214c Mon Sep 17 00:00:00 2001 From: preshy-lael Date: Mon, 17 Jun 2024 04:47:29 -0700 Subject: [PATCH 2/6] precious from team charlie added some changes to treasure.md --- treasure.md | 1 + 1 file changed, 1 insertion(+) diff --git a/treasure.md b/treasure.md index f24cd32..e9af927 100644 --- a/treasure.md +++ b/treasure.md @@ -206,3 +206,4 @@ You have documented a newly found artifact, but some details were incorrect. You --- These exercises will provide you with practical experience using GitHub and help you develop a solid understanding of fundamental GitHub commands and workflows. +precious from team charlie made a change to the guide \ No newline at end of file From 02a944a40cc63e9342441df1ec919b6318dcda48 Mon Sep 17 00:00:00 2001 From: preshy-lael Date: Mon, 17 Jun 2024 05:13:43 -0700 Subject: [PATCH 3/6] Precious added version 1 of the manuscript --- manuscript.txt | Bin 0 -> 66 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 manuscript.txt diff --git a/manuscript.txt b/manuscript.txt new file mode 100644 index 0000000000000000000000000000000000000000..49ce8e463cd6661d4418679c6b713214cdb995f1 GIT binary patch literal 66 zcmezW&ygXIA( Date: Mon, 17 Jun 2024 05:19:10 -0700 Subject: [PATCH 4/6] Precious updated to version 2 of the manuscript --- manuscript.txt | Bin 66 -> 66 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/manuscript.txt b/manuscript.txt index 49ce8e463cd6661d4418679c6b713214cdb995f1..815089d15466a7711fff08223c4a45d2cf75c5f4 100644 GIT binary patch delta 11 ScmZ>Anqb3b#K6nI#Q*>f0|B4_ delta 11 ScmZ>Anqb3b$iU0M#Q*>e{Q;i< From 3396b89987dfe02997a5d37da8604e3070b0fc9b Mon Sep 17 00:00:00 2001 From: preshy-lael Date: Mon, 17 Jun 2024 05:20:01 -0700 Subject: [PATCH 5/6] Precious updated to version 3 of the manuscript --- manuscript.txt | Bin 66 -> 66 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/manuscript.txt b/manuscript.txt index 815089d15466a7711fff08223c4a45d2cf75c5f4..9f64506e74e487d94d946c5bd18fc269ac13f80d 100644 GIT binary patch delta 11 ScmZ>Anqb3b%)raQ#Q*>f2?3!1 delta 11 ScmZ>Anqb3b#K6nI#Q*>f0|B4_ From 513da90a2a2e7a608b2e986f7dcdbd24cae7c1af Mon Sep 17 00:00:00 2001 From: preshy-lael Date: Mon, 17 Jun 2024 08:05:37 -0700 Subject: [PATCH 6/6] Revert "Precious updated to version 3 of the manuscript" This reverts commit 3396b89987dfe02997a5d37da8604e3070b0fc9b. --- manuscript.txt | Bin 66 -> 66 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/manuscript.txt b/manuscript.txt index 9f64506e74e487d94d946c5bd18fc269ac13f80d..815089d15466a7711fff08223c4a45d2cf75c5f4 100644 GIT binary patch delta 11 ScmZ>Anqb3b#K6nI#Q*>f0|B4_ delta 11 ScmZ>Anqb3b%)raQ#Q*>f2?3!1