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

Update the local repository

Task 2: Footer

At this point, the footer PR should be merged. You may not have realized but we already started another round on the roadmap.

We requested a new review and ooloo-bot already approved. That means we're again on the right side of the roadmap. She didn't request any changes and we already merged the branch.

So the next step on the roadmap is pull main.

GitHub Flow

The changes from the footer branch are inside the main branch on GitHub but not in our local repository yet.

So go ahead, checkout the main branch and pull the latest changes. When you have a look at the history you should see two new commits on main: one for the header fix and one for the footer.

Once you're done, it's time for the next task: the content container.

Next: Planning & Implementation