Merge conflicts why they happen in Git - Mini Project: Build & Apply

Understanding Why Merge Conflicts Happen in Git

📖 Scenario: You are working on a team project using Git. Two team members make changes to the same file but in different branches. You want to understand why Git sometimes cannot automatically combine these changes and shows a merge conflict.

🎯 Goal: Learn how to create a simple Git repository, make changes in two branches that cause a merge conflict, and observe the conflict message Git shows.

📋 What You'll Learn

Create a Git repository with a file named notes.txt containing specific text

Create a branch named feature and modify notes.txt in it

Switch back to main branch and modify the same line in notes.txt

Attempt to merge feature branch into main and observe the merge conflict message

💡 Why This Matters

🌍 Real World

Merge conflicts happen often when multiple people work on the same files in a project. Understanding why they happen helps you fix them quickly.

💼 Career

Developers and DevOps engineers must handle merge conflicts daily to keep code working smoothly and avoid losing work.

1

Create initial Git repository and file

Initialize a Git repository and create a file named notes.txt with the exact content: Hello from main branch. Then add and commit this file.

Git

# Initialize git repo and create notes.txt with content
# Your code here

Hint

Use git init to start the repo. Use echo to write text to notes.txt. Then add and commit the file.

2

Create and switch to feature branch, modify file

Create a new branch called feature and switch to it. Then change the content of notes.txt to Hello from feature branch. Add and commit this change.

Git

git init

echo "Hello from main branch" > notes.txt

git add notes.txt

git commit -m "Initial commit with notes.txt"

# Create and switch to feature branch, modify notes.txt
# Your code here

Hint

Use git checkout -b feature to create and switch branches. Then modify the file and commit.

3

Switch back to main branch and modify file

Switch back to the main branch. Change the content of notes.txt to Hello from main branch updated. Add and commit this change.

Git

git init

echo "Hello from main branch" > notes.txt

git add notes.txt

git commit -m "Initial commit with notes.txt"

git checkout -b feature

echo "Hello from feature branch" > notes.txt

git add notes.txt

git commit -m "Update notes.txt in feature branch"

# Switch to main branch and update notes.txt
# Your code here

Hint

Use git checkout main to switch back. Then modify and commit the file.

4

Attempt to merge feature branch into main and observe conflict

Run the command to merge the feature branch into main. Observe the output message that shows a merge conflict in notes.txt.

Git

git init

echo "Hello from main branch" > notes.txt

git add notes.txt

git commit -m "Initial commit with notes.txt"

git checkout -b feature

echo "Hello from feature branch" > notes.txt

git add notes.txt

git commit -m "Update notes.txt in feature branch"

git checkout main

echo "Hello from main branch updated" > notes.txt

git add notes.txt

git commit -m "Update notes.txt in main branch"

# Merge feature branch into main and observe conflict
# Your code here

Hint

Use git merge feature to merge the feature branch into main. Git will show a conflict message.

Practice

1. Why do merge conflicts happen in Git?

easy

A. Because Git lost the commit history

B. Because the same part of a file was changed differently in two branches

C. Because the repository is too large

D. Because the branch names are the same

Solution

1. Step 1: Understand what causes merge conflicts

   Merge conflicts happen when Git tries to combine changes but finds different edits in the same part of a file from two branches.

2. Step 2: Identify the correct cause

   Only when the same lines are changed differently does Git stop and ask for help, causing a conflict.

3. Final Answer:

   Because the same part of a file was changed differently in two branches -> Option B

4. Quick Check:

   Same file part changed differently = merge conflict [OK]

Hint: Conflicts happen when edits overlap in the same file area [OK]

Common Mistakes:

• Thinking conflicts happen due to repo size
• Believing branch names cause conflicts
• Assuming commit history loss causes conflicts

2. Which Git command is used to start a merge that might cause conflicts?

easy

A. git push

B. git branch

C. git clone

D. git merge

Solution

1. Step 1: Identify the command that combines branches

   The git merge command is used to combine changes from one branch into another.

2. Step 2: Understand when conflicts occur

   Conflicts can happen during this merge if changes overlap, so git merge is the command that triggers this process.

3. Final Answer:

   git merge -> Option D

4. Quick Check:

   git merge starts merges that may conflict [OK]

Hint: Use git merge to combine branches and check for conflicts [OK]

Common Mistakes:

• Confusing git branch with git merge
• Using git clone to merge
• Thinking git push merges branches

3. Given two branches, master and feature, both changed the same line in app.txt. What will happen when you run git merge feature on master?

medium

A. Git will automatically merge without any issues

B. Git will delete app.txt

C. Git will create a merge conflict in app.txt

D. Git will ignore changes from feature branch

Solution

1. Step 1: Analyze the changes in both branches

   Both branches changed the same line in app.txt, so Git cannot decide which change to keep automatically.

2. Step 2: Understand Git's behavior on conflicting changes

   Git will stop the merge and mark app.txt as conflicted, requiring manual resolution.

3. Final Answer:

   Git will create a merge conflict in app.txt -> Option C

4. Quick Check:

   Same line changed differently = conflict created [OK]

Hint: Same line changed in both branches causes conflict [OK]

Common Mistakes:

• Assuming Git merges automatically always
• Thinking Git deletes files on conflict
• Believing Git ignores conflicting changes

4. You ran git merge feature and got a conflict. Which step should you take to fix it?

medium

A. Edit the file to choose which changes to keep, then commit

B. Rename the branch and try merging again

C. Run git push immediately

D. Delete the conflicting file and commit

Solution

1. Step 1: Understand how to resolve merge conflicts

   When a conflict occurs, you must open the conflicting file and decide which changes to keep or combine.

2. Step 2: Complete the merge after resolving conflicts

   After editing and saving the file, you add it and commit to finish the merge process.

3. Final Answer:

   Edit the file to choose which changes to keep, then commit -> Option A

4. Quick Check:

   Resolve conflicts by editing files, then commit [OK]

Hint: Fix conflicts by editing files before committing [OK]

Common Mistakes:

• Deleting files instead of resolving conflicts
• Pushing before resolving conflicts
• Renaming branches to fix conflicts

5. Two developers edited different parts of the same file in separate branches. When merging, why might Git NOT report a conflict?

hard

A. Because changes are in different lines and Git can merge automatically

B. Because Git ignores changes in one branch

C. Because the file was deleted in one branch

D. Because the branches have the same name

Solution

1. Step 1: Understand Git's merge behavior with non-overlapping changes

   If changes are made in different parts of a file, Git can combine them automatically without conflicts.

2. Step 2: Recognize why no conflict occurs

   Since the edits do not overlap, Git merges both changes smoothly.

3. Final Answer:

   Because changes are in different lines and Git can merge automatically -> Option A

4. Quick Check:

   Non-overlapping changes merge without conflict [OK]

Hint: Different lines changed merge automatically [OK]

Common Mistakes:

• Thinking Git ignores one branch's changes
• Assuming file deletion causes no conflict
• Believing branch names affect conflicts