Agile and Beyond 2016

"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.