0/2

Lesson02

beginner

Fast-Forward Merge

Goal

Merge a branch that is simply ahead of main, and see Git fast-forward.

feature/login has two finished commits, and nobody has touched main since the branch was created. You are on main. Merge the feature in and watch the main label in the graph jump forward.

Objectives

0/2
  1. Merge feature/login into main. (Current objective)
  2. main now points at the same commit as feature/login. No merge commit was needed. (Not started)

Your task nowStep 1 of 2

Merge feature/login into main.

Need help?

Reference

What a fast-forward looks like

$ git merge feature/login

Updating 4b7d2e1..9c1e5b2
Fast-forward
 login.css | 3 +++
 login.js  | 5 +++++
 2 files changed, 8 insertions(+)
 create mode 100644 login.css
 create mode 100644 login.js

Updating 4b7d2e1..9c1e5b2 means main moved from its old commit to the feature's commit. The lines below summarize which files changed and by how many lines.

Preparing your workspace…

Repository Graph

Click a commit to inspect it

0 commits

Working Tree

Not a Git repository yet

No unstaged changes

Your working tree matches the staging area.

Staging Area

Files prepared for the next commit

No staged changes

Use git add to prepare files for your next commit.

Repository

Committed history

No commits yet

Use git commit to record staged changes.