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

Continue with footer

Task 2: Footer

Now that the fix of the header is merged we can continue working on the footer task.

Check your PR. ooloo-bot should have reviewed your code by now.

Change requests in footer PR

This time we didn't get an immediate approval. ooloo-bot found something to complain about. That means we have some more work to do on the footer task.

Before we start implementing the change requests let's have a quick look at the roadmap again to see where we're at. And one more time, try to answer the following questions:

Which path will we take on the roadmap to implement the footer?

roadmap

Got the answer?

Next: Change Requests