You're reading from GitHub for Next-Generation Coders Build your ideas, share your code, and join a community of creators

Product type Paperback

Published in Jul 2024

Publisher Packt

ISBN-13 9781835463048

Length 384 pages

Edition 1st Edition

Tools

Git

Concepts

DevOps

Author (1):

Igor Irić

View More author details

Table of Contents (21) Chapters

Preface

1. Part 1: Getting Started with GitHub FREE CHAPTER

2. Chapter 1: Introduction to Version Control and GitHub

3. Chapter 2: Mastering GitHub Essentials

4. Part 2: Collaborative Development Using GitHub

5. Chapter 3: GitHub Features for Collaborating on Projects

6. Chapter 4: Branching in GitHub and Git

7. Chapter 5: Collaborating on Code through Pull Requests

8. Chapter 6: Resolving Merge Conflicts – on GitHub and Locally

9. Part 3: Mastering Git Commands and Tools

10. Chapter 7: Git History and Reverting Commits

11. Chapter 8: Helpful Tools and Git Commands

12. Part 4: Advanced GitHub Functionalities

13. Chapter 9: Leveraging GitHub Actions for Automation

14. Chapter 10: Enhancing GitHub Security Measures

15. Chapter 11: Engaging with the Open Source Community

16. Part 5: Personalizing Your GitHub Experience

17. Chapter 12: Crafting Your GitHub Profile

18. Chapter 13: GitHub Copilot Aiding Code Creation

19. Index

Why subscribe?

20. Other Books You May Enjoy

Understanding merge conflicts and how they occur

You and your team colleague are both updating a one-page portfolio website. You’re working on the About Me section, while your colleague is adding new fonts and styles to the entire page. This is where merge conflicts come into play:

Figure 6.1 – Merge conflicts

What is a merge conflict?

Think of a merge conflict like two people trying to paint different pictures on the same canvas at the same time. You both have your ideas, but they clash in the same space:

Figure 6.2 – What is a merge conflict?

How does a merge conflict happen?

Both you and your colleague pull the latest version of the website from the main branch to start your work. You add a detailed biography and some images to the About Me section, and your colleague changes the font style and color scheme of the entire page, including the About Me section. Figure 6.3 demonstrates this clash...