Search icon CANCEL
Arrow left icon
Explore Products
Best Sellers
New Releases
Books
Videos
Audiobooks
Learning Hub
Conferences
Free Learning
Arrow right icon
Arrow up icon
GO TO TOP
Mastering Git

You're reading from   Mastering Git Attain expert-level proficiency with Git by mastering distributed version control features

Arrow left icon
Product type Paperback
Published in Aug 2024
Publisher Packt
ISBN-13 9781835086070
Length 444 pages
Edition 2nd Edition
Tools
Concepts
Arrow right icon
Author (1):
Arrow left icon
Jakub Narębski Jakub Narębski
Author Profile Icon Jakub Narębski
Jakub Narębski
Arrow right icon
View More author details
Toc

Table of Contents (21) Chapters Close

Preface 1. Part 1 - Exploring Project History and Managing Your Own Work
2. Chapter 1: Git Basics in Practice FREE CHAPTER 3. Chapter 2: Developing with Git 4. Chapter 3: Managing Your Worktrees 5. Chapter 4: Exploring Project History 6. Chapter 5: Searching Through the Repository 7. Part 2 - Working with Other Developers
8. Chapter 6: Collaborative Development with Git 9. Chapter 7: Publishing Your Changes 10. Chapter 8: Advanced Branching Techniques 11. Chapter 9: Merging Changes Together 12. Chapter 10: Keeping History Clean 13. Part 3 - Managing, Configuring, and Extending Git
14. Chapter 11: Managing Subprojects 15. Chapter 12: Managing Large Repositories 16. Chapter 13: Customizing and Extending Git 17. Chapter 14: Git Administration 18. Chapter 15: Git Best Practices 19. Index 20. Other Books You May Enjoy

Answers

Here are the answers to the questions given above:

  1. Use git init, git add ., and git commit to create a repository from existing files. Use git clone to get your own copy of the existing repository.
  2. Use git commit or git commit -a to create a new revision, and use git push to publish changes.
  3. Use git fetch to get updates from other developers, or git pull to get updates and merge them together. Use git merge (or, as mentioned in later chapters, git rebase) to combine changes.
  4. Merge conflicts are presented using the <<<<<<<, =======, and >>>>>>> markers; you can also find the ||||||| marker used, depending on the configuration. To resolve the conflicts, you need to edit files marked as conflicting into shape, use git add on them when finished, and then finalize the merge with git commit or git merge --continue (or rebase with git rebase --continue).
  5. To make Git ignore specific types of files, you need to add appropriate...
You have been reading a chapter from
Mastering Git - Second Edition
Published in: Aug 2024
Publisher: Packt
ISBN-13: 9781835086070
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 $19.99/month. Cancel anytime