[kyle]

In the second part of this series, we explore a very common problem that teams usually run into when collaborating on GitHub Desktop—merge conflicts. These can cause significant delay to your work, as you are forced to handle them when they occur before progressing; and it can take a fair bit of time and skill to solve them.

Resolving them incorrectly can also cause work progress to be lost.

Hence, in this article, we’ll be covering what they are, how you can avoid them, and how you can resolve them.

(more…)