This repository has been archived by the owner on Oct 25, 2021. It is now read-only.

The magic of merging

Jump to bottom

clegoues edited this page Jan 13, 2015 · 1 revision

A merge conflict happens when you and someone else change the same thing at the same time.