thinQmaster Virtual testing partner Adaptive practice exams that find your weak spots and drill them. Every answer explained. From $69
Enroll

thinQmaster

Find your exam

Five questions free, before you decide.

Step 1 · choose a vendor

In one of our camps? Your practice exams come with the tuition — they are on your study page already.

DevOps & Automation · Foundational

Merge

Combining the changes from one Git branch into another, creating a merge commit when histories have diverged.

Definition

git merge integrates another branch's commits. If the target has no new commits, Git can fast-forward; otherwise a three-way merge creates a commit with two parents. Conflicts must be resolved manually when the same lines change.

Example

git switch main && git merge feature/login

Exam tip

Merge preserves history; rebase rewrites it into a linear sequence.

Related terms