Code Contributions and Pushing Code

C-MacD / system-design-cruisine

System Design CMPT 330 project. Colin MacDonald, Erin Alvarico, Elizabeth Bellissimo, Melissa Aguilar.

https://c-macd.github.io/system-design-cruisine/

2 stars 0 forks source link

Code Contributions and Pushing Code #4

Open aguilarmelissa101 opened 3 years ago

aguilarmelissa101 commented 3 years ago

Create an issue detailing how you will push/pull code without stepping on each other’s toes.
No use of the file upload will be allowed on GitHub
No use of individual repositories should be used. Everything should be tracked with the team repository

Hint: Look at branching and Pull Requests to come up with a good work flow

aguilarmelissa101 commented 3 years ago

We will be pushing and pulling code by having our own branches. For example:

Melissa Branch
Liz's Branch
Erin's Branch
Colin's Branch

Here will be able to write our own code and not double code/ write unnecessary things. I think this will keep everything organized and this way when the code is merged together we won't step over each other.

erinalvarico commented 3 years ago

I agree with Melissa's breakdown to declare our own branches. This will help us cover more area and content whilst not encroaching on each other's coding abilities.

On the bright side as well, if one of our members need help it will not jeopardize the whole website (the issue will reside in their code only)

C-MacD commented 3 years ago

Once someone completes a reasonably major feature, they should create a pull request. Everyone else should take a look at it and leave feedback and approve or reject changes. Once a change is approved, then it will get merged into the master branch. Then everyone will have to merge the change from the master branch and into the branch they are working on.