Git is a version control system that allows developers to track changes in code and collaborate on projects. GitHub is a hosting service for Git repositories that offers collaboration features like code review and branching workflows. The document introduces Git and GitHub basics and outlines the GitHub Flow for collaborating via feature branching, pull requests, and code review before merging changes into the master branch. It concludes with reminders for good version control practices and sources for further information.

1. Code Collaboration
an introduction to git and github

2. Agenda
● Introduction to Git
● Introduction to GitHub
● Introduction to GitHub Flow
● Hands-on Lab

3. Introduction to Git
● Version Control System
● Feature Control System
● Developer 911
● Local

4. Introduction to Git
● Repository
● Branch
● Commits
● Pull Requests
● Collaborators

5. Introduction to GitHub
● Git on the Cloud
● Collaborative - Work with your team!
● Code Review
● Become famous
● Remote

6. Introduction to GitHub - Why?
● Easy
● Redundant
● De-facto Standard
● Again, Collaborative

7. GitHub Flow - Create a Branch

8. GitHub Flow - Add Commits

9. GitHub Flow - Open a pull request

10. GitHub Flow - Discuss and Review your code

11. GitHub Flow - Deploy / Test

12. GitHub Flow - Merge

13. Hands-on
● Setup Account
● Install GitHub Desktop
● Create repo
● Create branch
● Push / Sync
● Collaborate
○ master branch protection
○ add your team members
● Conflict resolution
● Tada!

14. Things to remember
● Add comments wherever possible
● Always add a good commit message
● Sync your code with remote often (as much as possible)
● Do a code review and test before merging to master branch
● Git is not almighty! Breakdown the project into smaller chunk to avoid code
conflict

15. Sources
https://guides.github.com/introduction/flow/