The Definitive Guide to Forks and Branches in Git

The Definitive Guide to Forks and Branches in Git

Open source patterns don’t always make the most sense for business. Their goals are a bit different: open source favors experimentation, where business tends to want focus in order to reduce time to market. Structural choices tend to mirror these goals. And the...

Git Rebase: An Illustrated Guide

Git Rebase: An Illustrated Guide

Use git rebase to ensure you have the latest code from master, which will help avoid future merge conflicts. Let’s walk through an example of how git rebase affects commit history: Imagine you create a feature branch from master, and work on it over the course...

A Practical Guide to Using .gitignore

A Practical Guide to Using .gitignore

With high profile attacks becoming a regular part of the news cycle (see Yahoo, Target, Sony…), security is an increasingly relevant consideration for anyone developing a product. Unfortunately, security is often more about what we don’t think of than what we...

Git Squashing: An Illustrated Guide

Git Squashing: An Illustrated Guide

GitHub’s new ‘squash and merge’ button has given much easier access to this Git power feature. But what is squashing, really, and what is it useful for? Imagine you’re working on a small feature, and toward that end you check in 9 commits. That might represented...