Book Image

Git for Programmers

By : Jesse Liberty
Book Image

Git for Programmers

By: Jesse Liberty

Overview of this book

Whether you’re looking for a book to deepen your understanding of Git or a refresher, this book is the ultimate guide to Git. Git for Programmers comprehensively equips you with actionable insights on advanced Git concepts in an engaging and straightforward way. As you progress through the chapters, you’ll gain expertise (and confidence) on Git with lots of practical use cases. After a quick refresher on git history and installation, you’ll dive straight into the creation and cloning of your repository. You’ll explore Git places, branching, and GUIs to get familiar with the fundamentals. Then you’ll learn how to handle merge conflicts, rebase, amend, interactive rebase, and use the log, as well as explore important Git commands for managing your repository. The troubleshooting part of this Git book will include detailed instructions on how to bisect, blame, and several other problem handling techniques that will complete your newly acquired Git arsenal. By the end of this book, you’ll be using Git with confidence. Saving, sharing, managing files as well as undoing mistakes and basically rewriting history will be a breeze.
Table of Contents (16 chapters)
11
Finding a Broken Commit: Bisect and Blame
13
Next Steps
14
Other Books You May Enjoy
15
Index

You messed up the remote by pushing a broken branch

If (and when) you break the Master branch by pushing an incomplete and broken local copy, dry your tears, take heart! This can be fixed.

Note, this should not be possible. If you are using Azure DevOps (or something similar) your pipeline should not accept any merge that doesn't compile (and arguably pass a set of unit tests). But I digress…

The first command you want is:

git reset --hard <remoteRepository> / <Yourbranch>@{1}

That resets your local copy of <Yourbranch> to the last synchronized version of <remoteRepo>. Thus, if your branch is Feature1 and it is on origin, you would write:

git reset --hard origin/Feature1@{1}

Now you want to restore the remote repo to its state before you broke it:

git push -f <remoteRepository><Yourbranch>