Git Style

Dev cycle

• Pushes
• Content (YAML) -> master
• Functionality (HTML, CSS, JS) -> dev
• Broken (committed) -> local only
• Branches
• dev
  • ready to be merged with master at all times
• master
  • only content (YAML)
• new branches
  • anything broken

Branches for new things

• Requirements
• Creation requirements
• One of...
  • Multiple people
  • Long term
• Agreed upon
• Must be deleted after work is finished
• Will be merged with dev
• Steps

1. Pull origin/dev to dev
2. Create new branch
3. Work on new branch
4. Commit
5. Switch to dev
6. Pull origin/dev to dev
7. Merge new branch to dev
8. Push
9. Delete accordian

Git commits

• One or more commits per feature
• Descriptive
• Terse
• No names
• Minimal swear words
• Merge commits
• Start with merge
• Follow APA style
• Reference issues
• Use resolves [issue number]

Git issues

• Creation labels go through Max
• Label sparingly
• Must have a point
• Tags used sparingly & important polls
• Close via commit
• No jokes about issues
• Meta
• Only Max and Chris can make meta issues