Resolving a conflict

Learn the steps to resolve a conflict by hand.

How Do You Resolve a Conflict?

When a merge conflict occurs, first open the affected file and inspect its conflict markers. You can manually edit the file to decide which changes should be kept.

<<<<<<< HEAD
console.log("Merhaba");
=======
console.log("Hello");
>>>>>>> feature

Remove the markers and unnecessary sections, then save the file.

Staging the Resolved File

After editing the file and removing the conflict markers, you must tell Git that the conflict has been resolved. You do this by adding the file to the staging area with git add.

git add app.js
git status

You can check the file's status with git status. Staging indicates that the resolved content is prepared for the next commit.

Exercise Stage a Resolved File

Store the git add app.js command that should be executed after resolving a conflict in a JavaScript variable. Print the command with console.log().

Show example solution

const stageCommand = "git add app.js";

console.log(stageCommand);

Test yourself

What should you do first when resolving a conflict manually?
- Change the user configuration
- Recreate the repository
- Open the conflicted file and inspect its markers
- Delete all files
Show answer

Open the conflicted file and inspect its markers — First, inspect the conflicted file. This helps you understand which contents are conflicting.
Stage the Resolved File
```
git add ____
```
Show answer
```
git add app.js
```
Conflict Resolution Steps

Dosyayı aç

Inspect the conflicting content
İçeriği düzenle

Choose the changes to keep
İşaretleri kaldır

Remove the conflict markers
git add

Stage the resolved file

Next lesson: mergetool

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies