There it is, the word that every developer hates to see:
conflict. 😱 There's just no way around the occasional merge
conflict when working with Git (or other version control systems).
But when speaking with developers, I often hear that there's a sense
of anxiety or discomfort around the topic of merge conflicts.
Handling conflicts often remains a dark, mysterious place: a
situation where things are badly broken and it's unclear how to get
out of it (without making things worse).
While it's true that merge conflicts are an unavoidable part of a
developer's life, the discomfort in these situations is fully
My intention with this article is to bring some clarity to this
topic: how and when conflicts typically occur, what they actually
are, and how to solve - or undo - them.
When you properly understand these things, you'll be able to deal
with merge conflicts in a much more relaxed and confident way. 😍