From 5424333fe150bb0cef455247b43c506cd4211085 Mon Sep 17 00:00:00 2001 From: Michelle Voong <94016955+mvoong18@users.noreply.github.com> Date: Mon, 5 Feb 2024 13:46:41 -0500 Subject: [PATCH 1/2] Add files via upload --- sp24-team-a/README.md | 3 +++ sp24-team-a/data/temp.txt | 0 sp24-team-a/deliverables/temp.txt | 0 sp24-team-a/team-info-page | 0 sp24-team-b/README.md | 3 +++ sp24-team-b/data/temp.txt | 0 sp24-team-b/deliverables/temp.txt | 0 sp24-team-b/team-info-page | 0 sp24-team-c/README.md | 3 +++ sp24-team-c/data/temp.txt | 0 sp24-team-c/deliverables/temp.txt | 0 sp24-team-c/team-info-page | 0 sp24-team-d/README.md | 3 +++ sp24-team-d/data/temp.txt | 0 sp24-team-d/deliverables/temp.txt | 0 sp24-team-d/team-info-page | 0 16 files changed, 12 insertions(+) create mode 100644 sp24-team-a/README.md create mode 100644 sp24-team-a/data/temp.txt create mode 100644 sp24-team-a/deliverables/temp.txt create mode 100644 sp24-team-a/team-info-page create mode 100644 sp24-team-b/README.md create mode 100644 sp24-team-b/data/temp.txt create mode 100644 sp24-team-b/deliverables/temp.txt create mode 100644 sp24-team-b/team-info-page create mode 100644 sp24-team-c/README.md create mode 100644 sp24-team-c/data/temp.txt create mode 100644 sp24-team-c/deliverables/temp.txt create mode 100644 sp24-team-c/team-info-page create mode 100644 sp24-team-d/README.md create mode 100644 sp24-team-d/data/temp.txt create mode 100644 sp24-team-d/deliverables/temp.txt create mode 100644 sp24-team-d/team-info-page diff --git a/sp24-team-a/README.md b/sp24-team-a/README.md new file mode 100644 index 0000000..c528f41 --- /dev/null +++ b/sp24-team-a/README.md @@ -0,0 +1,3 @@ +Add your name to the team info page! + +At the end of the semester update this README with information on how to run your project. \ No newline at end of file diff --git a/sp24-team-a/data/temp.txt b/sp24-team-a/data/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-a/deliverables/temp.txt b/sp24-team-a/deliverables/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-a/team-info-page b/sp24-team-a/team-info-page new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-b/README.md b/sp24-team-b/README.md new file mode 100644 index 0000000..c528f41 --- /dev/null +++ b/sp24-team-b/README.md @@ -0,0 +1,3 @@ +Add your name to the team info page! + +At the end of the semester update this README with information on how to run your project. \ No newline at end of file diff --git a/sp24-team-b/data/temp.txt b/sp24-team-b/data/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-b/deliverables/temp.txt b/sp24-team-b/deliverables/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-b/team-info-page b/sp24-team-b/team-info-page new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-c/README.md b/sp24-team-c/README.md new file mode 100644 index 0000000..c528f41 --- /dev/null +++ b/sp24-team-c/README.md @@ -0,0 +1,3 @@ +Add your name to the team info page! + +At the end of the semester update this README with information on how to run your project. \ No newline at end of file diff --git a/sp24-team-c/data/temp.txt b/sp24-team-c/data/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-c/deliverables/temp.txt b/sp24-team-c/deliverables/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-c/team-info-page b/sp24-team-c/team-info-page new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-d/README.md b/sp24-team-d/README.md new file mode 100644 index 0000000..c528f41 --- /dev/null +++ b/sp24-team-d/README.md @@ -0,0 +1,3 @@ +Add your name to the team info page! + +At the end of the semester update this README with information on how to run your project. \ No newline at end of file diff --git a/sp24-team-d/data/temp.txt b/sp24-team-d/data/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-d/deliverables/temp.txt b/sp24-team-d/deliverables/temp.txt new file mode 100644 index 0000000..e69de29 diff --git a/sp24-team-d/team-info-page b/sp24-team-d/team-info-page new file mode 100644 index 0000000..e69de29 From 08dfa5e52ddebd2d0adfc8730967f4b547af0986 Mon Sep 17 00:00:00 2001 From: Michelle Voong <94016955+mvoong18@users.noreply.github.com> Date: Mon, 5 Feb 2024 13:47:55 -0500 Subject: [PATCH 2/2] Update README.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a8ac699..78d3684 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,10 @@ If your project has multiple teams add changes (code, deliverables, data, etc.) to your team folder. -Create a new branch from dev branch, add changes to your team folder (on the new branch you just created). +Create a new branch from your team branch (ex. branch name: team-a, team-b,...etc.), add changes to your team folder (on the new branch you just created). -Open a Pull Request to your dev. Add your PM and TPM as reviewers. ***Do not delete any team folders.*** +Open a Pull Request to your team branch (ex. branch name: team-a). Add your TA and TPM as reviewers. ***Do not delete any team folders.*** -At the end of the semester during project wrap up open a final Pull Request to main from dev. +At the end of the semester during project wrap up open a final Pull Request to dev from your team branch. +Full instructions on how to make a PR to a Spark! Repo [here](https://docs.google.com/document/d/1t8vDdMyV3RHuXNxIL4DDs7gXV1c89G1T6Xi69UGilS0/edit?usp=sharing)