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

A Roadmap

The GitHub Flow

When using Git professionally for the first time you might feel a bit lost in the process.

That's why I created this roadmap. To be honest, it might look a bit intimidating at first. But no worries. We'll use it together throughout this course. I'll explain it step by step so you can slowly get used to it.

roadmap

Feel free to download the roadmap or open it in another browser tab. Keep it at hand since we'll need it soon.

Next: Design & Tasks