Session

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

Have you ever said: "I just pushed a commit to remote main instead of my branch! Help!"?

Have you ever been in the following scenario: "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?"

Have you ever thought you messed up your branch on rebase, and then can't figure out what happened, and/or had the fear that you might have lost work during a rebase operation?

What about the time where you accidentally put a secret into GitHub and you need it to look like that commit never happened to avoid getting fired?

In this session, we'll discuss the GIT commands of Amend, Reset, Revert, Rebase, Bisect, and Cherry-Picking to perform surgery on any GIT repository when the stuff hits the fan such as the four scenarios mentioned above.

After learning how to fix these scenarios, you can take the knowledge and use it to handle many more difficult scenarios using these same commands and strategies.

Users will learn about the listed commands and then will get a chance to see them in action. If time allows, other discussions around protecting a repository and squash and rebase strategies can be discussed.

Brian Gorman

Microsoft Azure MVP, Speaker, Author, Trainer, and .Net Developer

Waterloo, Iowa, United States

View Speaker Profile