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

Another PR

Task 5: Bottom Section (continued)

But wait. Have you seen it already? ooloo-bot created a new PR.

Maybe you remember that she wanted to take over the Top Section task. Well, she finished the feature and wants your review.

top section pr

Have a look at the code changes. They look pretty similar to what we have in the bottom-section branch. With slight differences though in the markup and the .content class. These will lead to merge conflicts later on.

top section file changes

Before you continue with the next page quickly approve and merge the Top Section PR on GitHub.

Next: Merge Conflicts