Resolve a Simple Merge Conflict

Git & GitHub

Technical Specification

Intentionally create a merge conflict by editing the same line on two branches, then resolve it and complete the merge.

Input/Output Samples

Input:git status

Output:both modified: file.js (unmerged paths)

Optimal Logic Path

# after conflict
# edit file to resolve
git add conflicted-file.js
git commit

Architectural Deep-Dive

Conflicts are normal in team work; understanding how to manually resolve them is essential.