22. Git More Collaboration

• 22.1. What is Git?
  • 22.1.1. Version Control Systems
  • 22.1.2. Getting Started with Git
  • 22.1.3. Check Your Understanding
• 22.2. Repositories and Commits
  • 22.2.1. Create a Repository
  • 22.2.2. Making Commits
  • 22.2.3. Check Your Understanding
• 22.3. Remote Repositories
  • 22.3.1. Local, Remote, GitHub, Oh My!
  • 22.3.2. Collaborating with Colleagues
  • 22.3.3. Renaming the Default Branch
  • 22.3.4. Contributing to a Remote Repository
  • 22.3.5. Check Your Understanding
• 22.4. Branches
  • 22.4.1. Branching in Git
  • 22.4.2. Creating a New Branch
  • 22.4.3. Switching to an Existing Branch
  • 22.4.4. Check Your Understanding
• 22.5. Merging in Git
  • 22.5.1. How to Merge
  • 22.5.2. Merge Conflicts
    • 22.5.2.1. Ways to Avoid Merge Conflicts
  • 22.5.3. Check Your Understanding
• 22.6. Exercises: Git
  • 22.6.1. Working in a Local Repository
  • 22.6.2. Setting up a Github Account
    • 22.6.2.1. Create a Personal Access Token (PAT)
  • 22.6.3. Optional: The SSH Key
• 22.7. Studio: Communication Log
  • 22.7.1. Code Together
  • 22.7.2. Overview
  • 22.7.3. Gitting Ready
    • 22.7.3.1. Step 1: Create a New Local Repository
    • 22.7.3.2. Step 2: Push Your Repository To GitHub
  • 22.7.4. Git the Teamwork Started!
    • 22.7.4.1. Step 3: Add A Collaborator
    • 22.7.4.2. Step 4: Clone Project from GitHub
  • 22.7.5. Git Talking
• 22.8. Studio: Communication Log (cont.)
  • 22.8.1. Step 5: First Message Exchange
  • 22.8.2. Step 6: Create a Branch In Git
    • 22.8.2.1. View Branches in GitHub
  • 22.8.3. Step 7: Open a Pull Request in GitHub
  • 22.8.4. Step 8: Merge the Pull Request
  • 22.8.5. Resources
  • 22.8.6. Bonus: Merge Conflicts!
    • 22.8.6.1. Resolve the Merge Conflicts
    • 22.8.6.2. More Merge Conflicts!
  • 22.8.7. Avoiding Conflicts