Twin Cities Code Camp

Brian Gorman

Rescuing your GIT Repositories using Amend, Reset, Revert, Rebase, Bisect, and Cherry-Picking

by Brian Gorman

Sat, Apr 15, 2023
Room: Garden Room
Time: 10:15

I just pushed a commit to remote main instead of my branch! Help! We merged two features to main but now only one of them needs to go to production without losing the code for the other one ASAP - what do we do? I messed up my branch on rebase, and I can't figure out what happened, but I think I lost my work, can you help? I accidentally put a secret into GitHub and I need it to look like that commit never happened or I might get fired! In this session, we'll discuss the GIT commands of Amend, Reset, Revert, Rebase, Bisect, and Cherry-Picking to perform surgery on our repository when the stuff hits the fan.

About the Author

Brian is a Microsoft Azure MVP and is an experienced speaker, author, trainer, and .Net developer with MCSA: Web App Certification, MCSD: App Builder, and eleven Azure certifications including Azure Developer, Administrator, DevOps, Architect, Data Administrator, Security, IoT, CosmosDB, and a number of fundamentals, and has been an MCT since 2018. Brian has a masters of science degree in computer information systems, and a bachelor of science degree in computer science. Additionally, Brian has over ten years of experience instructing college courses online in SQL databases, C#/VB.Net/and Java object-oriented programming, and Microsoft Office. Brian has created many online technical training courses that can be found online on various platforms. Brian has also published a book with APress entitled "Practical Entity Framework" The second edition of the book targeting .Net Core 6 was released in late November of 2021. Brian has a new book slated to be released in 2023 on the AZ-204 Exam.