Direct link to the article Merge Conflicts: What They Are and How to Deal with Them​

Merge Conflicts: What They Are and How to Deal with Them​

Merge conflicts... Nobody likes them. Some of us even fear them. But they are a fact of life when you're working with Git, especially when you're teaming up with other developers. In most cases, merge conflicts aren't as scary as you might think. In this fourth part of our “Advanced Git” series we'll talk about when they can happen, what they actually are, and how to solve them.
Avatar of Tobias Günther
Tobias Günther on (Updated on )

Dock Show & Tell

Someone wrote in asking about some icons in my Dock. I figured that might be a fun thing to share, and y’all can follow suit and share yours as well. I know “Docks” are a little Mac-centric, but feel free …

Avatar of Chris Coyier
Chris Coyier on (Updated on )