Your task is as follows:
- Elect a team leader.
- The team leader must fork this repo to create a copy under your user.
- Invite the rest of your team to contribute to your repository. You can do this under Settings -> Manage access.
- Each team member (including the leader) must clone the repo to their machine and do the following:
- Create a feature branch off the
developmentbranch with the naming formatfeature/<your_name>. - Add your name and favourite food to the lists in
app.py, then commit your changes. - Push your new branch up to your repo.
- Create a pull request where the base branch is set to
development, and the compare branch is set tofeature/<your_name>. - Resolve any merge requests.
- Create a feature branch off the
- Once everyone's feature branch is merged into
development, merge fromdevelopmentintomainto 'release' the new version. - Finally, make a pull request from your forked repo's
mainbranch to my repo'smainbranch. Let me know and I'll review and (maybe) approve it!
First team to merge to main wins!
Note: Before anyone gets any smart ideas, the doing the following is not allowed:
- Committing the team's name and food directly to
main. - Only creating one merge request that contains every member's name and food.
- Merging a feature branch directly into
main.
Each member must create a separate pull request and merge into development! Anything else is CHEATING!