Here are the problems we were trying to fix: Thus, for our first step, we made a list of factors to take into consideration.
![hilton trello hilton trello](https://thehiu.com/wp-content/uploads/2022/07/GettyImages-1236033616.jpg)
#HILTON TRELLO ANDROID#
It’s fantastically simple! But… GitHub Flow relies on continuous deployment and Android apps can’t do that. Your context, goals, and constraints will guide you to the correct tool for the job.įor example, GitHub Flow is great! The only shared branch is main, you merge features via pull request, and bam - it’s deployed immediately.
#HILTON TRELLO CODE#
I don’t believe in a one-size-fits-all solution for basically anything and that’s especially true for code management strategies. With all this in mind, we set out to find a better branching strategy. This problem was compounded by a growing team the amount of communication required on where to merge code grows exponentially with the number of developers. In other words, the “simple” solution, when faced with unfortunately common circumstances, became quite complex and lacked a well-defined strategy. (I tried to make a chart demonstrating the above but it was such a clusterfuck I’ve spared you all from it.) Let’s hope the hotfix doesn’t require any further hotfixes or things get really ugly. We’d fix that on hotfix/1.2.1, oh but how do we make sure that bug fix makes it into main and release/1.3.0, fuck it let’s just cherry-pick everything. Suppose we were preparing release/1.3.0, but it turns out release/1.2.0 had a severe bug. Thus, release branches were now a gigantic PITA to create and delete.Īlso, our old strategy had a propensity to create nightmare situations when fixing release bugs.
![hilton trello hilton trello](https://i.ytimg.com/vi/kYdsxAsCDbk/maxresdefault.jpg)
Creating a new SOX-compliant branch had a lot of overhead and deleting one was even more heinous. For us, that meant we had to make release branches SOX-compliant, adhering to additional rules and constraints. main was intended to be releasable at all times, though we would occasionally create a release/x.y.z branch, if we felt some set of features needed extra testing time.Īfter being acquired by Atlassian, we ran into a couple problems with our process.įirst, Atlassian is a publicly traded company, and thus it must comply with the Sarbanes-Oxley Act (SOX). We would develop entirely off main using pull requests. Many years ago, Trello Android used a fairly simple git branching strategy - or so we thought at the time.