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

Need a 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

Need a 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

Need a 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

Need a hint?

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