© Mariot Tsitoara  2020
M. TsitoaraBeginning Git and GitHubhttps://doi.org/10.1007/978-1-4842-5313-7_13

13. Conflicts

Mariot Tsitoara1 
(1)
Antananarivo, Madagascar
 

The last chapter introduced us to the wonderful world of Merge Requests. You should know what their use is and why it is a good idea to use them. Even if they are a fairly simple concept to grasp, they also come with some shortcomings that are hard to ignore.

You are mostly done with your journey; you’ve come a long way. But there are still things that you need to learn before continuing your path all by yourself. You need to learn what problems you’re going to have along the way. We are going to talk about those problems in this chapter. First, we will re-review how branch merging works, ...

Get Beginning Git and GitHub: A Comprehensive Guide to Version Control, Project Management, and Teamwork for the New Developer now with the O’Reilly learning platform.

O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.