Happy Holidays from the Stash team!

On the Stash team, we are focused on building high-quality software. From mandatory code reviews to continuous performance testing to automated test suites, we take pride in ensuring that every release of Stash (14 in the past year and half) is the best product built in the best way. Why? We want to continuously improve […]

The essence of branch-based workflows

Two weeks ago I had the pleasure of speaking at the Jazoon conference in Switzerland about Git workflows. One particular piece that seemed to resonate well with the audience was the idea of looking at the underlying rules when it comes to branch based workflows. Workflows A workflow defines steps that represent how your team […]

Extending git

While Mercurial has a well defined (albeit internal) API that can be used to write extensions that extend the functionality of Mercurial, git’s extension model follows the Unix philosophy of composing small, simple programs to achieve a similar effect. What that means is that git “extensions” can be written in any language and by following […]

Moving Confluence from Subversion to git

Three months ago, the Confluence team switched from Subversion to git, just in time for our 4.1 release. In Confluence, git, rename, merge oh my… we talked about the problems we encountered with merges across branches that had lots of renames. In this post, we take a step back to look at the tools we used in order […]

Confluence, git, rename, merge oh my…

Confluence moved from Subversion to git 3 weeks ago and we were finally in a good position to merge a fairly significant reorganisation of our source code into master. Maven artifact and directory names now match and it is possible to rebuild Confluence without having to rebuild the world. Our architect Charles had this in […]