Merges are okay, alright? Cool.
Have a seat on the sofa for a moment, please. I want share something important with you.
Git merge conflicts are normal and okay.
They are supposed to happen and, most likely, will happen regularly. They don’t happen because you did something wrong. They happen because Git is trying to protect you from losing your hard work.
If you’re new to Git or haven’t done extensive work with it in a team environment then you probably haven’t had the experience of a lot of merge conflicts.
In a future article I will share how you can resolve conflicts but right now, let’s talk about prevention.
We can do some things to prevent conflicts; here’s a list of a few:
I’ll go into each one in detail in future articles.
Until then: Git conflicts are okay!