Pull conflict

Learn to resolve a conflict that arises during pull.

Conflicts During Pull

If remote changes modify the same lines differently from your local changes, a merge conflict may occur during git pull. Git asks you to decide which content should remain.

<<<<<<< HEAD
Local content
=======
Remote content
>>>>>>> origin/main

These markers identify the conflicting section; after resolving it, edit and save the file.

Steps to Resolve a Conflict

Remove the conflict markers from the file and keep the final content you want. After saving the file, use git add to tell Git that the resolution is complete.

git add index.html
git status
git commit

If the merge is still in progress, you can complete it with a commit. Do not leave conflict markers in the file.

Exercise Resolve the Conflict and Commit

After resolving the conflict, add index.html to the staging area and create a commit. Finally, print a completion message.

Show example solution

git add index.html
git commit -m "Resolve merge conflict"
print("Birleştirme tamamlandı")

Test yourself

What does Git expect you to do when a conflict occurs during pull?
- Delete the remote repository
- Automatically delete every commit
- Reset Git configuration
- Edit and resolve the conflicting content
Show answer

Edit and resolve the conflicting content — Correct. You should inspect the conflicting section, decide which content to keep, and edit the file.
Mark the Conflict as Resolved
```
git add ____
```
Show answer
```
git add index.html
```
Recognize Conflict Markers

<<<<<<< HEAD

Start of local changes
=======

Separates the two contents
>>>>>>> origin/main

End of remote changes
git add

Stages the resolution

Next lesson: Summary - Pull

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies