15. Git More Collaboration

• 15.1. What is Git?
  • 15.1.1. Version Control Systems
  • 15.1.2. Getting Started with Git
  • 15.1.3. Check Your Understanding
• 15.2. Repositories and Commits
  • 15.2.1. Create a Repository
  • 15.2.2. Making Commits
    • 15.2.2.1. The Four Stages of Making a commit
  • 15.2.3. git Tips and Tricks
  • 15.2.4. Check Your Understanding
• 15.3. Remote Repositories
  • 15.3.1. Local, Remote, GitHub, Oh My!
  • 15.3.2. Setting Up a Remote Repo
    • 15.3.2.1. Terminal and GitHub
  • 15.3.3. Collaborating with Colleagues
    • 15.3.3.1. Cloning a Repo
    • 15.3.3.2. Forking a Repo
  • 15.3.4. Contributing to a Remote Repository
  • 15.3.5. Check Your Understanding
• 15.4. Git Branches
  • 15.4.1. Branching in Git
  • 15.4.2. Checking on Your Branches
  • 15.4.3. Creating a New Branch
  • 15.4.4. Switching to an Existing Branch
  • 15.4.5. Renaming a Branch
  • 15.4.6. Check Your Understanding
• 15.5. Merging in Git
  • 15.5.1. Merge Conflicts
    • 15.5.1.1. Merge Conflict Symbols
    • 15.5.1.2. Ways to Avoid Merge Conflicts
  • 15.5.2. Check Your Understanding
• 15.6. Exercises: Git
  • 15.6.1. Working in a Local Repository
  • 15.6.2. Setting up a Github Account
    • 15.6.2.1. Create a Personal Access Token (PAT)
    • 15.6.2.2. Personal Access Token Resources:
  • 15.6.3. Optional: The SSH Key
• 15.7. Studio: Communication Log
  • 15.7.1. Getting Ready: Code Together
  • 15.7.2. Overview
  • 15.7.3. Step 1: Create a New Repository
    • 15.7.3.1. Windows instructions:
    • 15.7.3.2. Mac Instructions:
  • 15.7.4. Step 2: First Commit
  • 15.7.5. Step 3: Share Your Repository On GitHub
  • 15.7.6. Step 4: Clone a Project from GitHub
  • 15.7.7. Step 5: Add A Collaborator To A GitHub Project
  • 15.7.8. Step 6: Join the Project and Push
• 15.8. Studio: Communication Log (continued)
  • 15.8.1. Step 7: Pull Pilot’s Line and Add Another Line
  • 15.8.2. Step 8: Do It Again: Pull, Change, and Push!
  • 15.8.3. Step 9: Create a Branch In Git
  • 15.8.4. Step 10: Create a Pull Request In GitHub
  • 15.8.5. Step 11: Merge the Pull Request
  • 15.8.6. Resources
• 15.9. Bonus Mission: Merge Conflicts!
  • 15.9.1. Merge Conflicts!
  • 15.9.2. Resolving Merge Conflicts
  • 15.9.3. Pulling the Merged Code
  • 15.9.4. More Merge Conflicts! (Bonus of the Bonus)
  • 15.9.5. Avoiding Conflicts