Git with the Flow: lessons learned from adopting Gitflow one step at a time

Source control is an unglamorous but important part to an effective agile team.  Distributed SCM like Git is (still!) new and unfamiliar territory for some teams, yet it can be the gateway to new modes of collaboration and workflow.

At this talk I will share my experience of adopting Git, and Stash, on my teams, one small step at a time.  As the teams got comfortable and built up their confidence, they made their way from a centralized Subversion-like workflow, to full-blown Gitflow, in just a few months.

So why does a talk about SCM belong at an Agile conference?  The answer is: this is not about a particular SCM tool.  It's about people, collaboration and the learning process.  It's about how SCM tools enabled us to work together as a team more effectively, with better transparency and discipline.  



Outline/Structure of the Talk

Go through the series of steps we took - for each step, what issues did we run into, what did we learn, and what did we improve.

Learning Outcome

If you've made the leap to Git but haven't taken full advantage of the possibilities that it opens up, I hope you'll come away with some interest in doing more with it.  And in general, I hope you'll see how you can use source control tools as a lever to drive collaboration.

Target Audience


schedule Submitted 5 years ago

  • Bill Schneider

    Bill Schneider - Functional testing is for everyone! Busting myths about unit vs. functional testing

    45 Mins

    I will share how I led a team from believing that end-to-end functional (browser) tests were "other" or "someone else's problem", to engaging the whole team in writing these kinds of tests.  By the end of the transition these tests were on almost equal footing as unit tests.

    Along the way, I had to challenge conventional wisdom and dogma about unit tests - that unit tests are easier than functional tests, that unit tests are less brittle, or that unit tests are unconditionally useful.  

    This talk is more about changing people's mindset than about specific tools, although I found that having the right tools made the mindset shift possible.