Tag: Git
The Siren Song of Git Commit Amend
Ever made a commit in Git only to realize you’ve forgotten something, add it, then make a second commit? At first glance the git commit –amend flag is an appealing solution. By combining it with the -a and -C flags, the git commit -a –amend -C HEAD command overwrites the previous commit data with the [...]
Git Mergetool
Cheap branching and merging is one of the great features of distributed version control systems (DVCS). When merging two branches in Git, you’re often left with a few conflict files Git can’t – and shouldn’t try to – resolve automatically. One simple way to streamline conflict resolution is to use git mergetool. You’ll still spend [...]
An Unplanned Reminder About the Importance of Backups
Two hours into a board meeting my Mercurial repository went belly up. It took another hour before I could leave and start to do some damage control. My initial recovery attempt didn’t go very well. The debugging tools for Mercurial allowed me to resolve initial case-folding error, only to have a second immediately pop up. [...]
Outgrowing Mercurial
While working at Raka Creative, we used Subversion as our centralized version control system. When I left to work at CELEST, I went from being part of a team of developers to being the sole developer. Using Subversion had opened my eyes to the importance of version control, but it was clear a centralized version [...]