Software Development At Mocana (Part 2) -- Subtree Merging

By Mike Pontillo | 6/3/13 10:10 PM

In my last post, I described how we bring together multiple git repositories by using the repo tool. I didn't really go into detail on the disadvantages of this approach. In many cases, this may be too much overhead for the development team. Often, it's simpler for everyone to have everything in just one repository. (especially when branching, or committing code that touches files across the entire project)

Read More >

Software Development at Mocana — Version Control

By Mike Pontillo | 4/29/13 10:10 PM

Note: This post is part 1 of a two-part series. The second post in this series is here.

In this post, I’d like to give an overview of some of the tools we use for software development at Mocana, specifically around version control.

Mocana has a large Subversion-based source tree. Newer projects are using git, but it’s still somewhat of a mix. We have a large codebase, dating back to our founding in 2002 (though the first Subversion commit is an import from somewhat later). Managing all the moving pieces can be a challenge, and I wanted to share some of our experiences.

Read More >