1. Contents
  2. 15. Git More Collaboration

15. Git More Collaboration

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