Something that I didn’t find immediately obvious was how to deal with conflicts in Git, so here’s a quick tutorial. Conflicts arise when two different branches are working on the same file and then try to commit changes. Conflicts don’t have to be catastrophic, it simply depends on what’s happend with the file.
Back in high school, you probably learned the Scientific Method. It probably looked something like this: (quoted from sciencebuddies.com) When I first got started with web design, I thought it was an art. That was bad news at the time because if you’ve ever met me, you’ll know I’m not the most artistic [...]
Responsive Design, or the idea that a website should respond to the size and orientation of the device on which it’s being viewed, is a tough concept for some designers and developers to wrap their heads around. The best advice I can give someone who is just getting started in responsive design is to starting [...]