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

Final Words

Recap

Congrats! You succesfully finished this course about using Git in a professional team. I hope you learned a thing or two.

If you found this course valuable please don't forget to share it with your friends on Twitter or elsewhere. It would mean a lot to me.

Finally, let's quickly recap what we covered:

a Git workflow using Pull Requests and code reviews
merging and squash merging
using rebase to incorporate changes from other branches
using interactive rebase to edit the commit history
resolving merge conflicts
force pushing (with the force-with-lease option)

This is a great foundation to start using Git in a professional team.

Last but not least, don't forget to get your guide.