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 Conflict

A situation where Git cannot automatically combine changes because the same part of a file was modified differently in both branches.

Definition

Git marks conflicts with <<<<<<<, =======, and >>>>>>> markers. The developer edits the file to the correct result, stages it with git add, and completes the merge or rebase.

Example

Two branches change the same line of config.yaml; Git stops and asks for manual resolution.

Exam tip

After resolving, git add the file then git commit (merge) or git rebase --continue.

Related terms