Summary - Conflict resolution

Combine conflict steps to resolve a merge conflict.

Conflict Resolution Workflow

If a conflict occurs during a merge, first inspect the markers in the file. Compare the current branch's content with the incoming branch's content, then edit the appropriate result manually or use a visual tool.

Inspect conflict
      |
      v
Resolve content
      |
      v
Stage file

After resolving the conflict, stage the file with git add to tell Git that the conflict has been resolved.

Exercise Arrange Conflict Resolution Commands

Store the commands for visually inspecting a conflict and staging the resolved file in a JavaScript array, in order. The first command must be git mergetool and the second must be git add app.js. Print each command on a separate line using forEach.

Show example solution

const commands = [
    "git mergetool",
    "git add app.js"
];

commands.forEach(command => console.log(command));

Test yourself

Which action tells Git that a conflict has been resolved?
- git init
- git config
- git add
- git branch
Show answer

git add — The resolved file is staged with git add. This tells Git that the file's conflict has been resolved.
Check the File Status After a Conflict
```
git ____
```
Show answer
```
git status
```
Complete Conflict Resolution

Conflict markers

Identify conflicting sections
Resolve

Selects the appropriate content
Mergetool

Provides visual comparison
Stage

Prepares the resolved file

Next lesson: git stash

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies