Get startedGet started for free

Resolving a merge conflict

You are in the main branch, and want to merge your recent edits from the documentation branch.

This exercise is part of the course

Intermediate Git

View Course

Hands-on interactive exercise

Turn theory into action with one of our interactive exercises

Start Exercise