Summary - Merging

Combine merge types to build a branch flow.

Merge Summary

When merging branches in Git, you must be on the target branch and merge the source branch with git merge. If the target branch has no independent commits, a fast-forward may occur; if both branches have diverged, a three-way merge can be used.

git switch main
git merge feature

A three-way merge generally creates a merge commit with two parents. This preserves the history of both branches.

Exercise Print a Merge Workflow

Store the git switch main and git merge feature commands in a JavaScript array, in that order. Use forEach to print each command on a separate line.

Show example solution

const commands = [
    "git switch main",
    "git merge feature"
];

commands.forEach(command => console.log(command));

Test yourself

Which merge type is used when both branches contain separate commits after their common ancestor?
- Fast-forward
- Three-way merge
- File deletion
- Global configuration
Show answer

Three-way merge — When both branches have progressed independently, Git performs a three-way merge by considering the common ancestor and the latest commits of both branches.

Identify the Target Branch Pointer

git switch main
git status
____

Show answer

git switch main
git status
git log --oneline

Distinguish Merge Types

git merge

Brings the source into the target
Fast-forward

Moves the pointer forward
Üç yönlü birleştirme

Uses the ancestor and two tips
Merge commit

Has two parents

Next lesson: What is GitHub?

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies