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

Planning

Task 2: Footer

As you probably remember we have 5 tasks to implement in total:

Header
Footer
Content Container
Top Section
Bottom Section

The header is done already which means the next task is implementing the footer.

Footer

Looks basically the same as the header, right?

It's time to have a look at the roadmap again. Try to answer the following question:

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

roadmap

Got the answer?

Next: Implementation