What is the difference between fast-forward and merge commit?

A fast-forward occurs when the target branch (e.g., main) has not received any new commits since your branch was created. Git simply moves the pointer forward. A merge commit is created when both branches have diverged: Git combines the changes in a new dedicated commit.

How do I resolve a merge conflict?

Open the conflicted file in your editor. You will see markers >>>>>. Choose the version to keep (or combine both), remove the markers, then run git add and git commit. GitQuest trains you to resolve these conflicts step by step.

Should I use merge or rebase?

Merge preserves the complete history and creates a merge commit. Rebase rewrites the history for a more linear result. For beginners, merge is safer. Rebase is useful for cleaning up a branch before merging it.

Yes. If the merge is not yet committed, git merge --abort cancels the operation. If the merge is already committed, git revert -m 1 HEAD creates a commit that undoes the merge. GitQuest offers investigations to practice these scenarios.

Why are merge conflicts so scary?

Because people do not practice them enough. A conflict is just Git telling you: "I do not know which version to keep, you decide." With practice, it becomes second nature. GitQuest offers investigations dedicated to conflicts to demystify the topic.

Git merge explained: merging branches

Merge is the operation that brings together work from multiple branches. Understand the different types of merges, conflicts, and how to resolve them with confidence.

Practice merge See examples

gitquest — enquête

merge

Most used command in teams

Main types of merge

90%

Of conflicts resolve in 5 min

50+

Investigations to practice

Key concept

What is git merge?

git merge combines the work of two branches into one. It's the fundamental operation of collaborative work with Git.

You create a branch

You work on your feature in a separate branch, without touching main.

You finish your work

Your changes are committed. Your branch is ready to be integrated.

You do the merge

You switch to main and merge your branch. The work is integrated.

The two types of merge

Simple

Fast-forward

When main has not received any new commits. Git simply moves the pointer forward. No merge commit, linear history.

gitquest — fast-forward

# Fast-forward: the main branch has not moved

$git checkout main

Switched to branch 'main'

$git merge feature/header

Updating a1b2c3d..e4f5g6h

Fast-forward

src/header.tsx | 25 ++++++++++

1 file changed, 25 insertions(+)

Standard

Merge commit

When both branches have diverged. Git creates a special commit that combines changes from both sides.

gitquest — merge commit

# Merge commit: both branches have diverged

$git checkout main

$git merge feature/login

Merge made by the 'ort' strategy.

src/login.tsx | 42 +++++++++++++

src/auth.ts | 18 ++++++

2 files changed, 60 insertions(+)

Do not panic

Resolving a merge conflict

A conflict happens when Git cannot automatically decide which version to keep. It's not an error, it's a question.

gitquest — merge conflict

# Merge conflict: same file modified on both sides

$git merge feature/footer

CONFLICT (content): Merge conflict in src/App.tsx

Automatic merge failed; fix conflicts and then commit the result.

$git status

Unmerged paths:

both modified: src/App.tsx

# After manually resolving the conflict:

$git add src/App.tsx

$git commit -m "Resolve conflict in App.tsx"

[main h8i9j0k] Resolve conflict in App.tsx

1. Identify

git status shows you the conflicted files. Open them in your editor.

2. Resolve

Choose the version to keep, combine if necessary, and remove the conflict markers (<<<<<).

3. Confirm

git add then git commit to finalize the resolution.

Essential merge commands

git merge <branch>

Merge the specified branch into the current branch

git merge --no-ff <branch>

Force creating a merge commit (no fast-forward)

git merge --abort

Cancel a merge in progress (in case of conflict)

git mergetool

Open a visual tool to resolve conflicts

git log --merge

Show the commits causing the conflict

git diff

During a conflict, show the differences to resolve

Part of the Git Branching Workflow guide

Related commands

git branch

Create and manage branches

git rebase

Alternative to merge

Resolve a conflict

Conflict resolution guide

GitQuest is created by Anaïs (nouvelle fenêtre), web developer and head of education, specializing in tech training and digital accessibility.

Questions about git merge

Ready to master merge?

Conflicts are no longer scary once you have practiced. Practice merge in a safe environment with GitQuest.

Practice merge

Git merge explained: merging branches

What is git merge?

You create a branch

You finish your work

You do the merge

The two types of merge

Fast-forward

Merge commit

Resolving a merge conflict

1. Identify

2. Resolve

3. Confirm

Essential merge commands

Related commands

Questions about git merge

What is the difference between fast-forward and merge commit?

How do I resolve a merge conflict?

Should I use merge or rebase?

Can I undo a merge?

Why are merge conflicts so scary?

Ready to master merge?