Conflict

Resolve a merge conflict and complete the commit.

Resolving a merge conflict

A merge conflict can occur when two branches modify the same sections of a file differently. Git pauses the merge and waits for you to edit the conflicted files. After keeping the desired content, stage the file and complete the merge with a commit.

git merge feature/payment
# Edit the file
git add payment.js
git commit -m "merge: resolve payment conflict"

Exercise Record the conflict resolution

Assume that you have resolved the merge conflict in settings.js. Stage the file and create a commit with the message fix: resolve settings conflict.

Show example solution

git add settings.js
git commit -m "fix: resolve settings conflict"

Exercise Complete the merge process

Merge the feature/settings branch into the current branch. After resolving the conflict, stage settings.js and create a commit with the message merge: complete settings update.

Show example solution

git merge feature/settings
git add settings.js
git commit -m "merge: complete settings update"

Test yourself

After resolving a merge conflict, which sequence completes the merge commit?
- Stage the file and create a commit
- Remove and re-add the remote
- Delete the tag and rename the branch
- Delete the file and create a new repository
Show answer

Stage the file and create a commit — After editing the conflicted file, stage it with git add and complete the merge with git commit.
Stage the resolved file
```
git add ____
```
Show answer
```
git add payment.js
```
Merge conflict stages

Çatışma

Overlapping changes
Düzenleme

Keeping the desired content
Sahneleme

Recording the resolution in Git
Commit

Completing the merge

Next lesson: PR flow

We Are Enhancing Your Experience

Cookie Preferences

Strictly Necessary Cookies

Analytical Cookies