1. Contents
  2. 22. Git More Collaboration

22. Git More CollaborationΒΆ

  1. 22.1. What is Git?
    1. 22.1.1. Version Control Systems
    2. 22.1.2. Getting Started with Git
    3. 22.1.3. Check Your Understanding
  2. 22.2. Repositories and Commits
    1. 22.2.1. Create a Repository
    2. 22.2.2. Making Commits
    3. 22.2.3. Check Your Understanding
  3. 22.3. Remote Repositories
    1. 22.3.1. Local, Remote, GitHub, Oh My!
    2. 22.3.2. Collaborating with Colleagues
    3. 22.3.3. Renaming the Default Branch
    4. 22.3.4. Contributing to a Remote Repository
    5. 22.3.5. Check Your Understanding
  4. 22.4. Branches
    1. 22.4.1. Branching in Git
    2. 22.4.2. Creating a New Branch
    3. 22.4.3. Switching to an Existing Branch
    4. 22.4.4. Check Your Understanding
  5. 22.5. Merging in Git
    1. 22.5.1. How to Merge
    2. 22.5.2. Merge Conflicts
      1. 22.5.2.1. Ways to Avoid Merge Conflicts
    3. 22.5.3. Check Your Understanding
  6. 22.6. Exercises: Git
    1. 22.6.1. Working in a Local Repository
    2. 22.6.2. Setting up a Github Account
      1. 22.6.2.1. Create a Personal Access Token (PAT)
    3. 22.6.3. Optional: The SSH Key
  7. 22.7. Studio: Communication Log
    1. 22.7.1. Getting Ready: Code Together
    2. 22.7.2. Overview
    3. 22.7.3. Studio
      1. 22.7.3.1. Step 1: Create a New Repository
      2. 22.7.3.2. Step 2: Share Your Repository On GitHub
      3. 22.7.3.3. Step 3: Clone a Project from GitHub
      4. 22.7.3.4. Step 4: Add A Collaborator To A GitHub Project
      5. 22.7.3.5. Step 5: Join the Project and Push
      6. 22.7.3.6. Step 6: Pull Pilot's Line and Add Another Line
      7. 22.7.3.7. Step 7: Do It Again: Pull, Change, and Push!
      8. 22.7.3.8. Step 8: Create a Branch In Git
      9. 22.7.3.9. Create a Pull Request In GitHub
      10. 22.7.3.10. Step 10: Make a Change in the New Branch
      11. 22.7.3.11. Step 11: Merge the Pull Request
      12. 22.7.3.12. Step 12: Merge Conflicts!
      13. 22.7.3.13. Step 13: Resolving Merge Conflicts
      14. 22.7.3.14. Step 14: Pulling the Merged Code
      15. 22.7.3.15. Step 15: More Merge Conflicts!
      16. 22.7.3.16. Resources