July 20–24, 2015
Portland, OR

A rebasing workflow for Git

Emma Jane Westby (UN-OCHA)
5:00pm–5:40pm Thursday, 07/23/2015
Foundations Portland 252
Average rating: ****.
(4.33, 3 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 leads the operations team for shared digital services at the United Nations Office for the Coordination of Humanitarian Affairs (OCHA). She is the author of O’Reilly’s Git for Teams and two books on web development.