Git Merge Conflict Simulator
Learn how to resolve merge conflicts
Main Branch
function greet() { return "Hello World"; }
Feature Branch
function greet() { return "Hi there!"; }
Attempt Merge
Merge Conflict!
Resolve the conflict by editing the code below:
Mark as Resolved
Conflict Resolved!