Reading conflict markers in Git - Mini Project: Build & Apply

Reading conflict markers in Git

📖 Scenario: You are working on a team project using Git. Two team members edited the same part of a file, causing a conflict when merging. You need to understand the conflict markers Git adds to the file to resolve it properly.

🎯 Goal: Learn how to identify and read Git conflict markers in a file after a merge conflict occurs.

📋 What You'll Learn

Create a file with conflicting content using Git conflict markers

Add a variable to hold the conflict marker string

Write a command to display the conflict markers in the file

Print the conflict markers to understand their structure

💡 Why This Matters

🌍 Real World

When multiple people work on the same code, Git helps combine changes. Sometimes, changes clash and Git marks these conflicts in files. Understanding these markers helps you fix conflicts correctly.

💼 Career

Developers and DevOps engineers often face merge conflicts. Knowing how to read and resolve conflict markers is essential for smooth collaboration and code integration.

1

Create a file with Git conflict markers

Create a file called conflict.txt with the following exact content including the conflict markers:
<<<<<<< HEAD
Line from branch A
=======
Line from branch B
>>>>>>> branch-B

Git

# Create the file conflict.txt with the exact conflict marker content
# Your code here

Hint

Use a text editor or echo commands to create conflict.txt with the exact lines including conflict markers.

2

Add a variable to hold the conflict marker string

Create a variable called conflict_marker and set it to the string '<<<<<<< HEAD' exactly.

Git

cat > conflict.txt >>>>>> branch-B
EOF

# Create a variable conflict_marker with the string '<<<<<<< HEAD'
# Your code here

Hint

Assign the exact string including the seven less-than signs and space to conflict_marker.

3

Display the conflict markers in the file

Write a command to display the contents of conflict.txt using cat conflict.txt.

Git

cat > conflict.txt >>>>>> branch-B
EOF

conflict_marker='<<<<<<< HEAD'

# Display the contents of conflict.txt
# Your code here

Hint

Use the cat command followed by the filename to show the file content.

4

Print the conflict marker variable

Write a command to print the value of the variable conflict_marker using echo $conflict_marker.

Git

cat > conflict.txt >>>>>> branch-B
EOF

conflict_marker='<<<<<<< HEAD'

cat conflict.txt

# Print the conflict_marker variable
# Your code here

Hint

Use echo $conflict_marker to print the variable's value.

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