Skip to content

Add example for merge conflict

Carsten Fortmann-Grote requested to merge intro_to_git-carsten into dev

This MR adds an example for how to deal with merge conflicts at a basic level.

Merge request reports