Trello and Github Workflow

trello-github-workflow.md

Team Project Workflow with Git and Trello

List Organization

• Files
  • a card for every file in the project
• Names
• a list of all the names of the people each assigned a different color
• Tasks
• a list of features that need to be implemented
• In Progress
• a place to store a feature card while you are working on it
• Pull Request
• a place to store a fature card when you are ready for a pull request
• Done
• a place to put a feature card when some one has made merged the pull request
• (optional) Dream Features
• a list of all the featues to do once your project is at a presentable state

Workflow

1. in trello choose a feature, mark it with your color and move it to the In Progress list
2. in trello color code the files that you are going to be working on
3. in master* branch pull current master
4. create a branch named after your feature
5. ** if anyone ever merges a pull request **

• switch to master and pull
• switch to your branch and merge from master
• handle any merge conflicts

6. when your feture is done

• check that you have merged the lastest master into your branch
• push to remote/branch-name
• create a pull request on github
• move your feature card from In Progress to Pull Requset
• Slack//Tell your teamates to review and merge/deny your pull request
• IF THEY MERGE EVERYONE HASTO DO STEP 5

7. Someone should review the pull request

• if you want to be very thurrow pull there branch down && merge master into it(shouldnt have to do anything) and run it
• If its no good tell who ever wrote the featue what problems youve discovered && discuss a solution
• if its good merge the pull request

8. Move the feture card from Pull Request to Done
9. Uncolor your the files you worked on in Trello
10. Grab a new Feature card and start back at 1

Can some of that be automated with Zapier? I'm looking for a good Trello/Github workflow with as much automation as possible, if you have improved yours let me know :)