Search icon CANCEL
Subscription
0
Cart icon
Cart
Close icon
You have no products in your basket yet
Save more on your purchases!
Savings automatically calculated. No voucher code required
Arrow left icon
All Products
Best Sellers
New Releases
Books
Videos
Audiobooks
Learning Hub
Newsletters
Free Learning
Arrow right icon
Arrow up icon
GO TO TOP
Git for Programmers

You're reading from  Git for Programmers

Product type Book
Published in Jun 2021
Publisher Packt
ISBN-13 9781801075732
Pages 264 pages
Edition 1st Edition
Languages
Author (1):
Jesse Liberty Jesse Liberty
Profile icon Jesse Liberty
Toc

Table of Contents (16) Chapters close

Preface 1. Introduction 2. Creating Your Repository 3. Branching, Places, and GUIs 4. Merging, Pull Requests, and Handling Merge Conflicts 5. Rebasing, Amend, and Cherry-Picking 6. Interactive Rebasing 7. Workflow, Notes, and Tags 8. Aliases 9. Using the Log 10. Important Git Commands and Metadata 11. Finding a Broken Commit: Bisect and Blame 12. Fixing Mistakes 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.

lock icon The rest of the chapter is locked
Register for a free Packt account to unlock a world of extra content!
A free Packt account unlocks extra newsletters, articles, discounted offers, and much more. Start advancing your knowledge today.
Unlock this book and the full library FREE for 7 days
Get unlimited access to 7000+ expert-authored eBooks and videos courses covering every tech area you can think of
Renews at €14.99/month. Cancel anytime