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 solve this challenge. Here is how I went about it.

Creating a new repository on GitHub

We've seen this before, so I'll do it quickly. I'll navigate to GitHub.com and fill in the usual form, making this demo program public:

Figure 5.16: Creating a new repository

Once you've created the repository, you and anyone else who wants to develop against it (and has the right permissions) can clone it locally.

Creating two feature branches with fake programmers

To do this, I'll create two directories, and clone to each. My first directory I'll call GitHub/DirA and my second GitHub/DirB. I will then clone into each:

Figure 5.17: Cloning the program to the local repository

Only Mateo will program in DirA, and only Kim will program in DirB.

Create a C# program in both DirA and DirB. Once done, use git status to ensure they are both pointing to main. To be certain, make a small...