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

Answer

Once again, there are many ways to answer this. I'll start by mirroring the RockyHorrorStash repo to RockyHorrorStash2, and then I will immediately clone it to my local repo.

I'll do the same thing with Panofy (to PanofyStash) and musicHandler2 (creating musicHandler2Stash). Now we have three repos we can work on:

  • musicHandler2Stash
  • PanofyStash
  • RockyHorrorStash

Let's begin with musicHandler2Stash by changing directory and getting a log of what is already there. Then let's open it in Visual Studio and do some work:

Figure 10.22: Log of MusicHandler2Stash

Let's make two changes by opening Visual Studio in that directory. We need changes in a couple of files, so let's just add comments. When we take a status, we see that there are two modified files:

Figure 10.23: Status of MusicHandler files after changes and before commit

Right in the middle of our work, we're asked to work on a...