Git branching
Interactive rebase in Sourcetree
Git’s interactive rebase lets you rewrite your repository’s history. Here’s how to do it using Sourcetree.
Unearth new repositories and Git v2 improvements in Bitbucket Server 5.13
How much time do you spend every week trying to find things? At home, it’s finding your keys and, at work, it’s finding the root cause of a bug or an old pull requests that introduced the bug. Since we’re not in the business of tracking your keys, Bitbucket Server 5.13 is making it easier to […]
Better repository search and fork discovery come to Bitbucket Server 5.6
How long has your code base been around? Jira Software is our oldest project at Atlassian clocking in at 15 years old. That’s a lot of code, and more importantly a lot of repositories with the word “Jira” in the name! Our switch to Git, where it’s common to create more repositories with less code in each, didn’t help […]
Bitbucket Server 5.5 brings personal access tokens and rebase workflows
These days developing software can feel a lot like running in a relay race, pushing ever faster to pass the baton amongst your teammates. The quicker you can push new features, bug-fixes, or performance improvements out to your customers the greater the competitive edge in the market. There are many ways to improve speed overall, […]
DevOps vs. compliance: a guide to having it all
The miasma of compliance documentation alone is enough to drain a person’s soul. Thank goodness for DevOps.
How to speed up code reviews
This is a guest blog post by Atlassian Marketplace vendor, Midori. Ask anyone in the DevOps community and chances are, they will tell you that code review is time-consuming and frequently boring, but it’s a critical phase of the software development process. What they mention less often is that the long back and forths with […]
New in Bamboo: branch status dashboard and plan configuration export
Earlier this month, Atlassian had its biggest event of the year – Atlassian Summit. I was lucky enough to attend as one of the Bamboo booth staff where I got to meet and talk to a lot of our passionate customers. One of the most requested features by our customers was the ability to export […]
Try new merge strategies in Bitbucket Server 4.9 and more
Bitbucket Server 4.9 and Bitbucket Data Center 4.9 bring strategy to the forefront of how teams work with their source code. Learn about three new features and how your team and business can set up new strategies to help teams work the way they want to work. Make disaster recovery part of your business plan […]
Living long and prospering with long-lived Git branches
This is a guest blog post by Holger Just from Plan.io, the creators of Planio for Bitbucket Cloud. It’s generally considered best practice to keep Git branches short-lived. But that approach won’t work for every team or every situation. I know this because it doesn’t work for my team. You see, our Git workflows include […]
Super-powered continuous delivery with Git
Developing as a team can be messy. You’re trying to understand which pieces of code everyone is working on, trying to make sure changes don’t conflict, trying to find defects before your customers do, and trying to keep everyone connected with the project up to date on how things are progressing. As it turns out, each of those problems is addressed by either Git branching or continuous delivery.
Git hooks for continuous integration
Git hooks are awesome in the context of continuous integration, so I want to share three CI-related use cases and point you to some ready-made hooks you can add to your workflow. If you’re new to Git hooks, no worries: we’ll start with the basics.
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 […]
Inside Atlassian: feature branching on the Stash team
Stash is now called Bitbucket Server. Read our announcement blog. One question that every team faces when moving to Git is what development workflow to use. Since every team is different and has different requirements, there is no one-workflow-fits-all approach. However, there is one rule all teams should follow when looking for a new workflow […]
Git branching and forking in the enterprise: why fork?
Enterprise DVCS Workflows are settling and patterns are consolidating. The flexibility git gives teams is so broad that even within a single company different teams might use different approaches to code sharing and collaboration. I speak from hard evidence as this is exactly what happens at Atlassian. The Stash team works differently than the Confluence […]
Git: automatic merges with server side hooks (for the win!)
This will be standard and easily understandable to anyone who has already been working with git for a while. If you come from a centralized, old school version control background and you are thinking of switching to Git – which I heartily recommend – you will find the topic of this post awesome, almost magical. […]