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

Challenge

Pretend you are two programmers working on the same project – a utility that contains a calculator and a Fahrenheit to Celsius converter. If you actually have two programmers to do this, even better.

Set up a new repository and clone it to two different folders. Have one person populate the main branch with the beginnings of the UtilityKnife project, commit the changes, and push it. Have the other person pull the main branch's changes.

OK, you both have a main branch with some code on it. Now have each programmer create their own branch, one to work on the calculator and the other to work on the converter. Along the way, the converter will want to use some of the methods of the calculator. Try to avoid or minimize conflicts, merge frequently, and resolve conflicts that arise.