GitHub Essential Training

Introduction

• Version control and collaboration with GitHub
• What you should know
• Using lab.github.com

1. The Modern Development Pipeline with GitHub

• Introduction to a widely used workflow
• The basic GitHub Workflow
• Designing your software delivery pipeline
• Tools for securing your workflow
• The role of CI
• The role of CD
• The supercharged GitHub workflow
• Getting started with our first GitHub Learning Lab

2. The Super Charged GitHub Flow in Action

• Enable continuous integration
• Learn how to use CI with a configuration file
• Specify the Docker image
• Merge pull request
• Add automated builds
• Add branch protections
• Add changes based on a review
• Add a CI unit test
• Fix broken build and merge
• Add CD to your pipeline

3. Understanding How Git Works

• Using Git locally
• The anatomy of a commit
• Why commit relationships matter
• Understanding branches
• Where is your HEAD?
• Where does Git store all of this information?
• Working with remote tracking branches
• Viewing local history
• Using Git aliases
• Help me find that one commit
• Reverting changes with Git
• Crafting atomic commits with Git
• Viewing local changes

4. Get Out of Anything with Git

• Rewriting history with Git
• Oops, I messed up my last commit
• Everything is broken, help me reset history
• Reset back to staging area
• Reset back to the working directory
• Reset to the trash
• I just want that one commit
• I need to restructure my commit history
• Rebase in action

5. Resolving Merge Conflicts

• What is a merge conflict and how do they happen?
• Resolving a merge conflict
• Make a local change and create the pull request
• Merge the pull request locally
• Resolve a simple conflict and merge
• Create your own conflict
• Resolve your own conflict
• Resolve advanced conflicts and merge

6. Customizing Your Workflows

• Merge strategies
• The perils of long-running branches
• Fine tuning the GitHub flow
• Considerations for workflow design
• Pitfalls of a non-innersource culture
• Adopting an innersource culture

Conclusion

• Next steps