Git for Teams

Git for Teams#

One 2-hour session

This workshop goes beyond the basics of Git: it explains how to customize Git to suit your preferred workflow and how to take full advantage of Git and GitHub’s collaborative features. Topics include why and how to use branches, how to merge branches even when there are conflicts, how to use GitHub’s project management features, and ways to configure Git to be more convenient. This workshop also prepares learners to use Git to contribute to open-source projects.

Learning Goals

After completing this workshop, learners should be able to:

  • Explain what a branch is

  • Describe some ways in which branches are useful

  • Explain how local branches and remote branches are different

  • List the branches in a repository

  • Switch between branches in a repository

  • Explain what a merge is

  • Merge one branch into another

  • Explain what a merge conflict is

  • Describe some ways to avoid merge conflicts

  • Resolve a merge conflict

  • Explain what an issue is

  • Create an issue

  • Explain what a fork is

  • List a repository’s remotes

  • Add a remote to a repository

  • Remove a remote from a repository

  • Explain what a pull request is

  • Create a pull request

  • Merge a pull request

  • Use GitHub Flow to contribute to projects

  • Create a .gitignore file to make Git ignore specific files

  • Describe some popular Git configuration changes

  • Create Git aliases

  • Describe some strategies to fix problems with repositories

  • Name some references to turn to for help with Git