Articles on Git
A Tale of Two GitHubs: A Practical Guide
Let’s say you have two GitHub accounts: one is a work account that you use for professional projects, and the other is for your top secret hacker projects. This can cause problems like trying to push to a repository with an account that doesn’t have access or having the wrong GitHub author in your commits. …
Always Squash and Rebase your Git Commits
Using git for version control allows for powerful collaboration in tech teams. Like any tool, if misused, it can also cause some serious headaches. After working with a wide variety of team sizes and dynamics, I’ve found that the squash and rebase workflow helps make the collaboration process more efficient and a hell of a lot …
Don’t Fear the Rebase: Git Garbage Collection and You
At Carbon Five, we work with developers of all experience levels. One source of fear and uncertainty I’ve seen at all levels is Git, the primary source control system used by our teams. Fear of losing work due to mishandled merge resolution, resetting branches or interactive rebasing is keeping developers from using some of the …
Crafting Commits in Git
A commit, like a well-designed function or class, should represent a single concept. A distinct, cohesive commit is easy to understand, review, and, if necessary, revert. Git’s powerful staging area allows you to finely craft your commits. You decide which files and even which changes in a file, down to the individual line level, to …
Integrating topic branches in Git
A key feature of Git is how easy it is to create topic branches to separate and organize, whether locally for your own work or remotely for others to share. However, if you are working on a team without even a simple workflow around the branching process can lead to a confusing repository. Here’s how we’ve been avoiding this and crating informative histories.