MINT - Magnus Stahre - git gone wild: how to recover from common git mistakes
Overview
Turn git chaos into confidence: for developers, learn practical recovery steps and safe workflows to fix mistakes, keep history clean, and ship with less fear.
Details
Agenda
- 5:30 - 6:30pm Networking
- 6:30 - 7:30pm Presentation
- 7:30 - 7:45pm Closing
Abstract
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.
Bio
Magnus Stahre is a software craftsman doing application development for three decades.
He is currently a Staff Software Engineer at Torc Robotics where he works on the simulation team.
Sponsors
