Intro

Mindset Git workflows

The GitHub Flow

The Flow When it gets complicated A Roadmap

The Project

Design & Tasks The Repository

Task 1: Header

Planning Implementation Open a Pull Request Request a review PR is approved Merging the PR Update the local repository

Git theory

Merge vs. Squash Merge

Task 2: Footer

Planning Implementation The Fix Continue with footer Change Requests Update the local repository

Task 3: Content Container

Planning & Implementation Hint

Task 5: Bottom Section

Planning Implementation Hint

Task 3: Content Container (continued)

Change Requests Update Pull Request

Task 5: Bottom Section (continued)

Incorporate changes Rebase Double-check Force Push Interactive Rebase Another PR Merge Conflicts Final Rebase Resolving the Conflicts Uncovering a Problem

Recap

PR is approved

Task 1: Header

A few seconds after you requested the review you should see this on the Pull Request page.

GitHub PR approved

Wow, that was quick. ooloo-bot already approved the PR without any complaints.

Lucky you.

How do we continue now? Have another look at the roadmap and try to answer the following questions:

Which path will we take on the roadmap now that the PR is approved?
What is the next Git command we will use?

roadmap

Got the answers?

Could you help me out?

If you enjoy this course so far I'd be super grateful if you could share it with your friends.

Next: Merging the PR