git merge-distinct: staging multiple branches with octopus-merge
Reading Time: 5 minutes git merge-distinct is a little tool that merges multiple branches containing non-conflicting changes into a single head, using git’s octopus-merge strategy.…
Featured
Codegeist is back in a big way
Reading Time: 2 minutes Codegeist is a remote hackathon where participants build innovative cloud applications for their favorite Atlassian tools. These apps can be for…
Hacking the DockerHub into Bitbucket
Reading Time: 2 minutes Today, I want to tell you about the results of a hackathon, or as we call it a ShipIt project. It’s fun…
Awesome ways to use add-ons to build better add-ons
Reading Time: 4 minutes This is a guest post written by Daniel Wester of Wittified, an Atlassian Marketplace vendor. Have you ever considered that the same…
Join Us for Our Next Dev Den Open Office Hours
Reading Time: < 1 minute The gang is reassembling again for another Dev Den Open Office Hours at the end of this month where we’ll be…
Stash Plugin Tutorial: Beer O’Clock Repository Hook
Reading Time: 2 minutes One of my favorite Stash features is its plugin system. Since Stash is a git repository host, 99% of Stash users…
Share your Minecraft world with a Google Map on AWS
Reading Time: 7 minutes Minecraft is one of my favorite video games of the last few years and if sales numbers are anything to go…
Securing your Git server against CVE-2014-9390
Reading Time: 4 minutes A critical vulnerability was identified in Git last week. This has been fixed in all maintained versions of Git (v1.8.5.6, v1.9.5,…
Atlassian update for Git and Mercurial vulnerability
Reading Time: < 1 minute The maintainers of the Git and Mercurial open source projects have identified a vulnerability in the Git and Mercurial clients for…
Feature Branches, Builds and Multiple Environments
Reading Time: 4 minutes In our recent Dev Den Office Hours we were asked some very interesting questions. One that caught my attention and on…