Skip to content

Commit

Permalink
Merge pull request #12 from BU-Spark/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
funkyvoong authored Feb 5, 2024
2 parents a511fc7 + 08dfa5e commit 0c446df
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 3 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: <code>team-a</code>, <code>team-b</code>,...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: <code>team-a</code>). 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 <code>main</code> from dev.
At the end of the semester during project wrap up open a final Pull Request to <code>dev</code> 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)
3 changes: 3 additions & 0 deletions sp24-team-a/README.md
Original file line number Diff line number Diff line change
@@ -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.
Empty file added sp24-team-a/data/temp.txt
Empty file.
Empty file.
Empty file added sp24-team-a/team-info-page
Empty file.
3 changes: 3 additions & 0 deletions sp24-team-b/README.md
Original file line number Diff line number Diff line change
@@ -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.
Empty file added sp24-team-b/data/temp.txt
Empty file.
Empty file.
Empty file added sp24-team-b/team-info-page
Empty file.
3 changes: 3 additions & 0 deletions sp24-team-c/README.md
Original file line number Diff line number Diff line change
@@ -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.
Empty file added sp24-team-c/data/temp.txt
Empty file.
Empty file.
Empty file added sp24-team-c/team-info-page
Empty file.
3 changes: 3 additions & 0 deletions sp24-team-d/README.md
Original file line number Diff line number Diff line change
@@ -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.
Empty file added sp24-team-d/data/temp.txt
Empty file.
Empty file.
Empty file added sp24-team-d/team-info-page
Empty file.

0 comments on commit 0c446df

Please sign in to comment.