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

Change Requests

Task 3: Content Container (continued)

At this point, you requested a review for the Bottom Section Pull Request that you just opened. In the meantime, ooloo-bot already reviewed the Content Container PR and left a change request.

change request

The change doesn't seem to take a lot of effort. But what do we have to do in terms of Git?

Another look at the roadmap

Have a look at the roadmap again and try to find the right path to implement the change request for the Content Container.

roadmap

Did you find the path?

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: Update Pull Request