Skip to content

Solo/xxy #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aria-x1 wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Solo/xxy #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66895b4
Add xxy solo file
Aug 20, 2025
3e4f7ed
Update README.md
prgoodwin Aug 20, 2025
3a6cf69
Update README.md
prgoodwin Aug 20, 2025
f15a943
IntelliJ is unnecessary.
prgoodwin Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Morning/solo/xxy.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Xinyi Xu
64 changes: 36 additions & 28 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,28 @@ 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

# add the class repo as 'upstream'
git remote add upstream https://github.com/<class-org-or-user>/<class-repo>.git
git fetch upstream
```
IntelliJ is not necessary for this activity, and it is meant to be done on the command line.

**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
```
(There are helpful commands at the bottom of the instructions)

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/<onyen>`.
4. Now navigate to the `solo/` folder (unrelated to branch name). Inside it, create a new text file named `<onyen>.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: <onyen>`.
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 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/<onyen>`.
7. Now navigate to the `solo/` folder (unrelated to branch name). Inside it, create a new text file named `<onyen>.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: <onyen>`.

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`).

Expand Down Expand Up @@ -81,7 +70,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/<team-id>/integration` from the base on their fork.
2. Then, merge each pair branch into the integration branch, one by one.
Expand All @@ -93,7 +82,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 `## <team-id>` followed by the list of pairs.
Expand Down Expand Up @@ -151,6 +140,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
```