Skip to main content
CSS is fun and cool and I like it.
Article

How to Deal with Merge Conflicts in Git

Everybody has a list of things they don't like: an appointment at the dentist, a traffic jam, or a canceled flight. When I was preparing my book, I wasn't surprised that a lot of designers and developers would add merge conflicts to this list without hesitation.

When using Git for version control, there is nothing to fear. Once you understand how merge conflicts work and how to deal with them, I'm sure you'll be able to cross them off … Read article

icon-link icon-logo-star icon-search icon-star