Git gone wild

A session at Agile and Beyond 2014

Friday 21st February, 2014

6:00pm to 6:45pm (LMT)

git gone wild: how to recover from common git mistakes. "Oh no! I just typed something into git and now my work is gone! Ahh!" Don't panic.

Contrary to popular belief, git is one of the most non-destructive version control systems available. When used right, git never loses any data, and even when misused, chances are very high you can still recover. This talk will present turn-by-turn directions on how to recover from a wide array of common git mistakes, and also provide some workflows to minimize them.

Examples include, but are not limited to:
* Changing spelling errors in commit messages.
* Split commits into multiple commits with logical separation.
* Combining multiple commits into one.
* Resetting the base commit when you accidentally branch off of the wrong branch.
* Recovering from merge conflicts. As well as more advanced topics, such as:
* Extracting parts (e.g. sub-directory) of a repository as a new repository.
* Merging multiple repositories into one while retaining version history.
* Removing confidential data accidentally committed.

About the speaker

This person is speaking at this event.
Magnus Stahre

Software engineer, college student and dad all rolled into one bio from Twitter

Next session in Room 1

7pm 45 Agile Tools in 45 Minutes by Paul Warner, PMP

Sign in to add slides, notes or videos to this session

Tell your friends!


Time 6:00pm6:45pm LMT

Date Fri 21st February 2014


Room 1, Adoba Hotel Dearborn

Short URL


Official event site


View the schedule


See something wrong?

Report an issue with this session