Conflict Trainer

0

1 / 10

Loading...

Prepare to resolve the conflict.

Easy

Git Terminology

Current Change (Ours): The code in the branch you are merging INTO (e.g., your local `main`).
Incoming Change (Theirs): The code in the branch you are merging FROM (e.g., a feature branch).
<<<<<<< HEAD: Marks the start of the conflicting changes from your current branch.
=======: Separates your changes from the incoming changes.
>>>>>> branch-name: Marks the end of the conflicting incoming changes.