From 66895b4649bd6ae3c55a867cba1e48871d7794a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Becca=E5=B0=8F=E9=9B=AA=E7=B3=95?= Date: Wed, 20 Aug 2025 11:20:42 -0400 Subject: [PATCH 1/4] Add xxy solo file --- Morning/solo/xxy.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Morning/solo/xxy.txt diff --git a/Morning/solo/xxy.txt b/Morning/solo/xxy.txt new file mode 100644 index 0000000..c1d82e9 --- /dev/null +++ b/Morning/solo/xxy.txt @@ -0,0 +1 @@ +Xinyi Xu \ No newline at end of file From 3e4f7ed9db7d14b56e7daa3c3e251dc6eb011882 Mon Sep 17 00:00:00 2001 From: "Dr. Prairie Rose Goodwin" Date: Wed, 20 Aug 2025 11:38:46 -0400 Subject: [PATCH 2/4] Update README.md Clarifying instructions --- README.md | 63 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index edcb4c9..2865ac5 100644 --- a/README.md +++ b/README.md @@ -15,39 +15,25 @@ Welcome to our collaborative Git exercise! In this activity, you will first work --- -## Part 1: Individual Contribution (No Conflicts) +## (Required) Part 1: Individual Contribution (No Conflicts) -**Setup remotes (run once per local clone):** -```bash -# already set automatically when you clone YOUR fork -git remote -v +(There are helpful commands at the bottom of the instructions) -# add the class repo as 'upstream' -git remote add upstream https://github.com//.git -git fetch upstream -``` - -**Keep your fork up to date (before new work):** -```bash -git checkout main -git fetch upstream -git merge --ff-only upstream/main -git push origin main -``` - -1. Make a fork of this repository on your local GitHub account and clone it to your computer. -2. You will see folders for the morning section and the afternoon section. Choose the appropriate folder to work in. -3. Create a new branch named `solo/`. -4. Now navigate to the `solo/` folder (unrelated to branch name). Inside it, create a new text file named `.txt`. -5. Add your full name inside the file. -6. Stage, commit, and push your branch to your fork on GitHub. -7. Open a pull request **from your fork’s branch** to the **upstream repository’s `main`** with the title `solo: `. +1. Make a fork of this repository by clicking the "fork" button on the website. +2. Clone your newly created repository to your computer. +3. You will need to set the upstream to point at the class COMP301-F25 repo. There are helpful commands at the bottom of the instructions. +4. You will see folders for the morning section and the afternoon section. Choose the appropriate folder to work in. +5. Create a new branch named `solo/`. +6. Now navigate to the `solo/` folder (unrelated to branch name). Inside it, create a new text file named `.txt`. +7. Add your full name inside the file. +8. Stage, commit, and push your branch to your fork on GitHub. +9. Open a pull request **from your fork’s branch** to the **upstream repository’s `main`** with the title `solo: `. Each student will have their own file, so there should be no conflicts in this step. --- -## Part 2: Pair and Team Contribution (Designed Conflicts) +## (optional if time) Part 2: Pair and Team Contribution (Designed Conflicts) 1. Your group of 4–6 students is a **team**. Choose a unique team identifier (for example, `UNC-Alpha`, `Sharks`, `Team42`). @@ -81,7 +67,7 @@ Each student will have their own file, so there should be no conflicts in this s --- -## Part 3: Conflict Resolution and Integration +## (Optional) Part 3: Conflict Resolution and Integration 1. The Integrator should create a new branch `team//integration` from the base on their fork. 2. Then, merge each pair branch into the integration branch, one by one. @@ -93,7 +79,7 @@ Each student will have their own file, so there should be no conflicts in this s --- -## Part 4: Class Roster Pull Request +## (Optional) Part 4: Class Roster Pull Request 1. The Integrator should append the team’s final roster to the file `class-roster.md`. - Add a section starting with `## ` followed by the list of pairs. @@ -151,6 +137,25 @@ Always remove `<<<<<<<`, `=======`, and `>>>>>>>`. Ensure the final `roster.md` ## Extra Debugging Commands - `git status` — check current branch and file state. -- `git log` — view commit history. +- `git log` — view commit history. +- `git remote -v` - view current origin and remote urls. --- + +**Setup remotes (run once per local clone):** +```bash +# already set automatically when you clone YOUR fork +git remote -v + +# add the class repo as 'upstream' +git remote add upstream https://github.com/COMP301-F25/Github-Activity.git +git fetch upstream +``` + +**Keep your fork up to date (before new work):** +```bash +git checkout main +git fetch upstream +git merge --ff-only upstream/main +git push origin main +``` From 3a6cf691b96199aa7bcfcbfcddeefc44b43fc06f Mon Sep 17 00:00:00 2001 From: "Dr. Prairie Rose Goodwin" Date: Wed, 20 Aug 2025 12:04:53 -0400 Subject: [PATCH 3/4] Update README.md Clarifying instructions --- README.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2865ac5..c615a5f 100644 --- a/README.md +++ b/README.md @@ -21,13 +21,14 @@ Welcome to our collaborative Git exercise! In this activity, you will first work 1. Make a fork of this repository by clicking the "fork" button on the website. 2. Clone your newly created repository to your computer. -3. You will need to set the upstream to point at the class COMP301-F25 repo. There are helpful commands at the bottom of the instructions. -4. You will see folders for the morning section and the afternoon section. Choose the appropriate folder to work in. -5. Create a new branch named `solo/`. -6. Now navigate to the `solo/` folder (unrelated to branch name). Inside it, create a new text file named `.txt`. -7. Add your full name inside the file. -8. Stage, commit, and push your branch to your fork on GitHub. -9. Open a pull request **from your fork’s branch** to the **upstream repository’s `main`** with the title `solo: `. +3. You will need to set the upstream to point at the class COMP301-F25 repo. There are a list of commands at the bottom of the instructions to help you do this. +4. Verify that the origin and remote are properly set by typing `git remote -v`. Once you have verified that everything looks right, you are ready to begin. +5. You will see folders for the morning section and the afternoon section. Choose the appropriate folder to work in. +6. Create a new branch named `solo/`. +7. Now navigate to the `solo/` folder (unrelated to branch name). Inside it, create a new text file named `.txt`. +8. Add your full name inside the file. +9. Stage, commit, and push your branch to your fork on GitHub. +10. Open a pull request **from your fork’s branch** to the **upstream repository’s `main`** with the title `solo: `. Each student will have their own file, so there should be no conflicts in this step. From f15a94353a96f6856ba4109a71db2f739613f394 Mon Sep 17 00:00:00 2001 From: "Dr. Prairie Rose Goodwin" Date: Wed, 20 Aug 2025 12:14:11 -0400 Subject: [PATCH 4/4] IntelliJ is unnecessary. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c615a5f..15cfdc3 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,8 @@ Welcome to our collaborative Git exercise! In this activity, you will first work ## (Required) Part 1: Individual Contribution (No Conflicts) +IntelliJ is not necessary for this activity, and it is meant to be done on the command line. + (There are helpful commands at the bottom of the instructions) 1. Make a fork of this repository by clicking the "fork" button on the website.