#web development workflow

Git workflow is important; really, really important. I wish I understood what a good git workflow looked like before I started the 3 week project, and how not having a good workflow will inevitably loose you hours (or days!) or work and be a giant headache. 

  WHAT NOT TO DO: 

Don’t do this, seriously. Our group would update the master branch, work on individual feature branches, then occasionally push feature branches up. We would also sometimes download everyones feature branches, merge them with all together locally, then merge it with master, and then push back up to the repo. This was SO wrong, we eventually lost a day and a half to repairing out workflow that we really could have used on making the project better. 

  WHAT YOU SHOULD DO: 

Depending on weather you want your teammates to be contributors on your repo, there are a couple ways to have a good workflow. The way we did it was pretty simple, everyone would pull the most recent master, and then branch off into a feature branch that they would work on. When the feature branch was complete  and working, you would return to the master branch, pull again if needed and then create a new branch based off the most recent master. Then you merge the copy of the master branch with your feature branch, and fix any merge errors if there are any, and push that branch to the repo. We would then create a pull request with that branch using the website. It’s common to tag all of your teammates in the pull request and coordinate with them before finalizing the merge. 

  You can also have every member of the team fork the repo, and work on their own fork, eventually submitting the pull request on their own. The rest of the workflow looks basically the same.