Get updates about development, productivity, and teamwork

Bloggers compare Git notes

Posted by Ryan Menezes on September 10, 2009 11:11:00 AM

If you use Git on Assembla, please vote in the git user survey. They're compiling information about users' demographics, hosts and preferences, and about which commands and tools people most often use.

Thousands of people use Assembla Git repositories. Some use them for single projects, while others maintain continuous agile processes. One reason Git attracts so many people is that it lets teams create their own workflows. Our customers using different processes have evolved various workflows to suit their needs.

A couple of blogs about Git workflows have caught my attention.

Rein Henrichs, who works for Hashrocket web development in Jacksonville, only writes on his blog a dozen times a year, but his March post A Git Workflow for Agile Teams drew in lots of links.  This process works well on Assembla, which has good support for branches in git.

Henrichs outlines the following workflow for feature developement:

1. Pull to update your local master
2. Check out a feature branch
3. Do work in your feature branch, committing early and often
4. Rebase frequently to incorporate upstream changes
5. Interactive rebase (squash) your commits
6. Merge your changes with master
7. Push your changes to the upstream

Joe Mailer describes a web-focused workflow in a post from last November. It puts your website on its server as a pair of repositories - a standard repository, "prime," whose working directory contains the live site, and a bare repository, "hub," from with other repositories are cloned. Mailer writes:

Using the pair of repositories is simple and flexible. Remote clones with ssh-access can update the live site with a simple git push to Hub. Any files edited directly on the server are instantly mirrored into Hub upon commit. The whole thing pretty much just works - whichever way it's used.

This process will work well if you use Assembla's FTP publishing and Server tools to run publishing or continuous integration from the production repository.

Finally, you might like to look at Boston consultant Oliver Steele's Git workflow, which he blogged about last year. His post also compares some alternate workflows and weighs the merits of a couple of Git features.

If you use Git, make sure you fill out their survery before it closes on September 15th.

About the author

Ryan Menezes