Git: Branches, Merges, and Remotes

Learn how to use the branching, merging, and remote features of Git for code management and collaboration.

Introduction

• Unlock powerful code management and collaboration tools in Git
• What you should know

1. Navigate the Commit Tree

• Reference commits
• Ancestry
• Tree listings
• Filter the commit log
• Format the commit log

2. Branching

• Branching overview
• Create branches
• Switch branches
• Create and switch branches
• Switch branches with uncommitted changes
• Compare branches
• Rename branches
• Delete branches
• Configure command prompt

3. Reset Branches

• Reset types
• Soft reset
• Mixed reset
• Hard reset

4. Merge Branches

• Merge code
• Fast-forward merge vs. true merge
• Merge conflicts
• Resolve merge conflicts
• Strategies to reduce conflicts

5. Stash Changes

• Save changes in the stash
• View stashed changes
• Retrieve stashed changes
• Delete stashed changes

6. Set Up a Remote

• Local and remote repositories
• Set up a GitHub account
• Add a remote repository
• Create a remote branch
• Clone a remote repository
• Track remote branches

7. Collaborate with a Remote

• Push changes to a remote repository
• Fetch changes from a remote repository
• Merge in fetched changes
• Check out remote branches
• Push to an updated remote branch
• Delete a remote branch
• Enable collaboration
• Collaboration workflow

Conclusion

• Next steps