18. Git Some ControlΒΆ

  1. 18.1. What is Git?
    1. 18.1.1. Version Control Systems
    2. 18.1.2. Version Control for This Course
      1. 18.1.2.1. Getting Started with Git
    3. 18.1.3. Check Your Understanding
  2. 18.2. Repositories and Commits
    1. 18.2.1. Create a Repository
    2. 18.2.2. Making Commits
      1. 18.2.2.1. Step 1: Make a Change
      2. 18.2.2.2. Step 2: Add Changes to a Commit
      3. 18.2.2.3. Step 3: Commit the Changes
    3. 18.2.3. Make Another Commit
    4. 18.2.4. When to Commit Changes
    5. 18.2.5. Commit Process Summary
    6. 18.2.6. Check Your Understanding
  3. 18.3. Navigating Commits
    1. 18.3.1. Commit to num_guess.py Again
    2. 18.3.2. Commit Log
    3. 18.3.3. Undo Changes Since Last Commit
    4. 18.3.4. Switching Between Commits
  4. 18.4. Branching Out
    1. 18.4.1. Branching in Git
    2. 18.4.2. On Branch main
    3. 18.4.3. Create a New Branch
    4. 18.4.4. Switching Between Branches
      1. 18.4.4.1. Uncommitted Work
    5. 18.4.5. Check Your Understanding
  5. 18.5. Merging in Git
    1. 18.5.1. How to Merge
    2. 18.5.2. Try It!
    3. 18.5.3. Merge Conflicts
      1. 18.5.3.1. Conflict Demo
        1. 18.5.3.1.1. Setup
        2. 18.5.3.1.2. Add Text In Both Branches
        3. 18.5.3.1.3. Resolving the Conflict
    4. 18.5.4. Avoiding Conflicts
    5. 18.5.5. Check Your Understanding
  6. 18.6. Git Tips
    1. 18.6.1. Git Stash
      1. 18.6.1.1. Try It!
    2. 18.6.2. Deleting a Branch
    3. 18.6.3. Git More Information
  7. 18.7. Remote Repositories
    1. 18.7.1. Local, Remote, GitHub, Oh My!
    2. 18.7.2. Team Projects
    3. 18.7.3. Saving to a Remote Repository
    4. 18.7.4. Check Your Understanding
  8. 18.8. Exercises: Git More Practice
    1. 18.8.1. Part A: Working with a Local Repository
      1. 18.8.1.1. Merging
      2. 18.8.1.2. Merge Conflicts
    2. 18.8.2. Part B: Set Up a Github Account
      1. 18.8.2.1. Create a Personal Access Token (PAT)
  9. 18.9. Project: Git a Remote Repository
    1. 18.9.1. Step 1: Create a New Local Repository
    2. 18.9.2. Step 2: Create a Remote Repository
    3. 18.9.3. Step 3: Push to the Remote Repository
      1. 18.9.3.1. Push a New Branch
    4. 18.9.4. Step 4: Pull Down Changes From the Remote
    5. 18.9.5. Success