Plurrrr

Defaulting to the system font of a particular operating system can boost performance because the browser doesn’t have to download any font files, it’s using one it already had. That’s true of any “web safe” font, though. The beauty of “system” fonts is that it matches what the current OS uses, so it can be a comfortable look.

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 optional.

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. 😍

This past summer, at the World Wide Developer Conference (WWDC), Apple announced that it would be transitioning from Intel to its in-house Apple Silicon over the next two years. Apple said the first Macs with in-house silicon would arrive by the end of 2020. Well, here we are, and we have a new MacBook Air, 13 inch MacBook Pro, and a Mac mini.

The form factors of these devices are identical, but the real magic is the new M1 chip inside. Is it as fast as Apple claims? Will it run our apps properly? What does the M1 chip mean for desktop computing generally? In this article, I will try and answer these questions.