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

Merging the PR

Task 1: Header

Once the Pull Request has been approved we're on the right side of the roadmap below the Code Review box.

GitHub Flow

Since the PR is already approved we can answer the first question with No. So we continue with merging the branch by clicking the green button in the PR.

Click Merge Pull Request Button

When you click the button you'll be asked for a title and a description. Every team has different conventions here. In our case you can leave the default Header (#1).

After Click Merge Pull Request Button

Note: The advantage of having the number of the PR in the commit message is that you always know which changes on the main branch belong to which PR.

Go ahead and click the green Squash and merge button. Once you're done come back and continue on the next page.

Next: Update the local repository