Blog

When you're working with git, you can push and pull code. I know it sounds weird. When you push code, it means you putting it on the server. You're pushing it online. When you pull code, it means that you're getting it off the server. You're pulling it down. So, a pull request is an official request to pull or merge your code.

When you're developing, each feature you work on should receive its own branch. This way, development on different features can happen simultaneously. If it's a team with multiple developers, then we can all be working on our own code, at the same time, without worrying about interfering or overwriting each other's code.

I finally decided to experiment with the Hyper Key and set up some custom keyboard shortcuts on my computer. Here, I'll explain how to set the key and some of the productive shortcuts I created.

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.

An app is an experience. I wanted to create a prototype that felt real. They could pull it up on their mobile device and feel like they were using an application — no smoke and mirrors. No handwaving. No magic.