Beginner's Guide to Using the Terminal

For years, I’ve been afraid of the Terminal. I was scared that I would erase my entire hard drive with a single typo. But, once I started spending more time in the Terminal, I became more comfortable and confident. Here are some of the commands that I've found to be the most useful.


Merge Conflicts

When we're merging branches or pushing code, git does a good job of handling updates automatically. Every once in a while, though, you may run into an issue where git doesn't know what to do. It doesn't know the best way to merge your files. This is called a merge conflict. If you've never seen this before, it can be a little scary. But *fear not*, today, we'll talk through how to resolve a merge conflict.

This industry moves fast, but you can stay up to date:

Receive a weekly email of the Internet's best from articles, to tutorials, to pro tips.