July 20–24, 2015
Portland, OR

A rebasing workflow for Git

Emma Jane Westby (UN-OCHA)
2:30pm–3:10pm Wednesday, 07/22/2015
Foundations Portland 251
Average rating: ***..
(3.82, 11 ratings)
Slides:   external link

Prerequisite Knowledge

Those with a basic understanding of using Git within team environments will get the most out of this session.


Ahh the great rebasing debate: where tables are flipped and chests are known to puff out like Godzilla. If you’re a newcomer to version control, you’ve probably heard people rage out about this “rebasing” thing and wondered what it was all about. And if you’re a seasoned Git user you probably have some VERY strong opinions about exactly which point in the development life cycle people should be rebasing.

In this presentation we’ll cover:

  • What rebasing actually does to your repository
  • The advantages to future you for using rebasing properly today
  • How to rebase a branch to clean up your private history
  • How to incorporate new work from a teammate with the rebase command
  • The disadvantages of using rebase incorrectly

And finally, we’ll have a little reality check where we talk about having empathy for inexperienced teams and why it doesn’t really matter if a team decides they’re not interested in using rebasing.

Bring your troll-retardant-flame suit as this topic always generates opinions. Hopefully this time you’ll come away with practical solutions too.

Photo of Emma Jane Westby

Emma Jane Westby


Emma Jane Hogbin Westby is an internationally renowned open source software advocate, technical author, and teacher. In January 2010 she was recognized by The Google Diversity Programme for her efforts in increasing female participation in software development. She is a frequent speaker at open source conferences in Canada, US, and Europe and has volunteered for several open source projects, including Drupal, The Linux Documentation Project, and Ubuntu.

In addition to her engaging conference presentations, Emma has also worked as a technical college instructor, as a curriculum developer, and has successfully run her own training business. Emma has been teaching internet technology since 2002, and is the author of Front End Drupal and Drupal User’s Guide.

Emma encourages non-traditional participation in technology through craft and believes that everyone is capable of mastering the tools that surround them. To help engage new ways of participating in technology, she open-sourced one of her knitting patterns so that you can make your very own Drupal Socks (as featured in CRAFTzine). You can follow her adventures on Twitter at @emmajanehw.

Comments on this page are now closed.


Picture of Emma Jane Westby
Emma Jane Westby
07/22/2015 5:37am PDT

Slides are available from: https://speakerdeck.com/emmajane/rebasing-workflow-oscon-2015