Reading conflict markers in Git - Interactive Code Practice

Practice - 5 Tasks

1fill in blank

easy

Complete the code to start resolving a merge conflict by opening the conflicted file.

Git

git [1]

Drag options to blanks, or click blank then click option'

Astatus

Bcommit

Cdiff

Dmerge

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git commit' before resolving conflicts

Using 'git merge' without specifying branches

Using 'git diff' without context

The git status command shows files with conflicts after a merge.

2fill in blank

medium

Complete the command to view the conflict markers inside a file named app.js.

Git

git [1] app.js

Drag options to blanks, or click blank then click option'

Alog

Bdiff

Cbranch

Dcheckout

Attempts:

3 left

💡 Hint

Common Mistakes

Using 'git log' which shows commit history

Using 'git branch' which manages branches

Using 'git checkout' which switches branches or files

The git diff command shows the differences including conflict markers in the file.

3fill in blank

hard

Fix the error in the conflict marker syntax shown below by completing the missing marker line.

Git

<<<<<<< HEAD
console.log('Version A');
[1]
console.log('Version B');
>>>>>>> feature-branch

Drag options to blanks, or click blank then click option'

A<<<<<<<

B>>>>>>>

C=======

DHEAD

Attempts:

3 left

💡 Hint

Common Mistakes

Using '>>>>>>>' instead of '======='

Using '<<<<<<<' again instead of the separator

Using branch names as markers

The conflict marker ======= separates the two conflicting changes.

4fill in blank

hard

Fill both blanks to complete the conflict markers for a file with conflicts.

Git

<<<<<<< [1]
code from first branch
[2]
code from second branch
>>>>>>> branch-name

Drag options to blanks, or click blank then click option'

AHEAD

B=======

Cfeature-branch

Dorigin/main

Attempts:

3 left

💡 Hint

Common Mistakes

Using branch names in the first blank instead of HEAD

Using branch names instead of the separator line in the second blank

The first marker shows the current branch (HEAD) and the second marker (=======) separates the conflicting changes.

5fill in blank

hard

Fill all three blanks to correctly identify the conflict markers and branch names in a merge conflict.

Git

<<<<<<< [1]
code from first branch
[2]
code from second branch
>>>>>>> [3]

Drag options to blanks, or click blank then click option'

AHEAD

B=======

Cfeature-branch

Dmain

Attempts:

3 left

💡 Hint

Common Mistakes

Mixing up branch names in the start and end markers

Using incorrect symbols for the separator

Omitting the HEAD marker

The conflict starts with <<<<<<< HEAD, the separator is =======, and the conflict ends with the other branch name >>>>>>> feature-branch.

Practice

1. What do conflict markers in a Git file indicate?

easy

A. They show where changes from different branches clash in the file.

B. They mark lines that are deleted permanently.

C. They highlight syntax errors in the code.

D. They indicate lines that are ignored by Git.

Solution

1. Step 1: Understand the purpose of conflict markers

   Conflict markers appear when Git cannot automatically merge changes from different branches.

2. Step 2: Identify what conflict markers show

   They highlight the exact lines where changes from two sources conflict, so you can decide how to fix them.

3. Final Answer:

   They show where changes from different branches clash in the file. -> Option A

4. Quick Check:

   Conflict markers = show clashes [OK]

Hint: Conflict markers always show merge clashes in files [OK]

Common Mistakes:

• Thinking conflict markers show deleted lines
• Confusing conflict markers with syntax errors
• Believing conflict markers mark ignored lines

2. Which of the following is the correct way conflict markers appear in a Git file?

easy

A. >>>>>> HEAD
Your changes here
======
Incoming changes here
<<<<<<< branch-name

B. <<<<<<< HEAD
Your changes here
=======
Incoming changes here
>>>>>>> branch-name

C. <<<<<<< branch-name
Incoming changes here
=======
Your changes here
>>>>>>> HEAD

D. ======
Your changes here
<<<<<<< HEAD
Incoming changes here
>>>>>>> branch-name

Solution

1. Step 1: Recall the standard conflict marker format

   Git uses <<<<<<< HEAD to start your changes, ======= to separate, and >>>>>>> branch-name to end.

2. Step 2: Match the correct sequence

   <<<<<<< HEAD Your changes here ======= Incoming changes here >>>>>>> branch-name matches this exact format with your changes first, separator, then incoming changes.

3. Final Answer:

   <<<<<<< HEAD Your changes here ======= Incoming changes here >>>>>>> branch-name -> Option B

4. Quick Check:

   Conflict markers start with <<<<<<< HEAD [OK]

Hint: Conflict markers start with <<<<<<< HEAD and end with >>>>>>> branch-name [OK]

Common Mistakes:

• Swapping HEAD and branch-name positions
• Using wrong number of < or > symbols
• Mixing up the order of your and incoming changes

3. Given this conflict marker snippet in a file:

<<<<<<< HEAD
int x = 5;
=======
int x = 10;
>>>>>>> feature-branch

What will be the value of x after you manually choose the incoming change and save?

medium

A. 15

B. 5

C. 10

D. Conflict remains, no value assigned

Solution

1. Step 1: Identify the incoming change section

   The incoming change is after the ======= marker, which is int x = 10;.

2. Step 2: Understand manual conflict resolution

   Choosing the incoming change means keeping int x = 10; and removing conflict markers.

3. Final Answer:

   10 -> Option C

4. Quick Check:

   Incoming change value = 10 [OK]

Hint: Incoming changes are after ======= marker [OK]

Common Mistakes:

• Choosing the code before ======= instead of after
• Leaving conflict markers in the file
• Assuming both values apply simultaneously

4. You see this conflict marker in your file:

<<<<<<< HEAD
console.log('Hello');
=======
console.log('Hi');
>>>>>>> update-branch

After editing, you accidentally leave the conflict markers in the file and commit. What problem will this cause?

medium

A. The conflict markers will be ignored and code runs fine.

B. Git will automatically fix the conflict on next pull.

C. Git will delete the file on next merge.

D. The code will have syntax errors and may not run.

Solution

1. Step 1: Understand what conflict markers are

   Conflict markers are not valid code; they are special symbols for humans to resolve conflicts.

2. Step 2: Effect of leaving markers in code

   If left in the file, the code will have syntax errors and likely fail to run or compile.

3. Final Answer:

   The code will have syntax errors and may not run. -> Option D

4. Quick Check:

   Leaving markers = syntax errors [OK]

Hint: Remove conflict markers before committing to avoid errors [OK]

Common Mistakes:

• Assuming Git fixes conflicts automatically after commit
• Thinking conflict markers are comments
• Believing code runs fine with markers present

5. You have this conflict in a file:

<<<<<<< HEAD
function greet() {
  return 'Hello';
}
=======
function greet() {
  return 'Hi';
}
>>>>>>> feature

You want to combine both greetings so the function returns both messages separated by a comma. How should you edit the file to resolve the conflict correctly?

hard

A. Replace the conflict markers with:
function greet() {
return 'Hello, Hi';
}

B. Keep only the HEAD version:
function greet() {
return 'Hello';
}

C. Keep only the feature version:
function greet() {
return 'Hi';
}

D. Leave the conflict markers and both versions as is.

Solution

1. Step 1: Understand the goal to combine greetings

   You want the function to return both messages, so you must merge the changes manually.

2. Step 2: Edit the file by removing conflict markers and combining lines

   Replace the conflict markers and both versions with a single function returning 'Hello, Hi'.

3. Final Answer:

   Replace the conflict markers with: function greet() { return 'Hello, Hi'; } -> Option A

4. Quick Check:

   Combine changes by editing and removing markers [OK]

Hint: Edit conflict markers out and combine code as needed before commit [OK]

Common Mistakes:

• Leaving conflict markers in the file
• Choosing only one version without combining
• Not saving changes before committing