Abstract
Last chapter was intense, wasn’t it? We talked about what are merge conflicts and when would they happen. We also saw how to resolve them manually. Don’t worry, this chapter will be much easier to digest. We are going to talk about how to get push your branch to remote after a merge conflict. Also, we are going to see some strategies to adopt to reduce the number of conflicts that might happen. Let’s go!
This is a preview of subscription content, log in via an institution to check access.
Access this chapter
Tax calculation will be finalised at checkout
Purchases are for personal use only
Author information
Authors and Affiliations
Rights and permissions
Copyright information
© 2020 Mariot Tsitoara
About this chapter
Cite this chapter
Tsitoara, M. (2020). More About Conflicts. In: Beginning Git and GitHub. Apress, Berkeley, CA. https://doi.org/10.1007/978-1-4842-5313-7_14
Download citation
DOI: https://doi.org/10.1007/978-1-4842-5313-7_14
Published:
Publisher Name: Apress, Berkeley, CA
Print ISBN: 978-1-4842-5312-0
Online ISBN: 978-1-4842-5313-7
eBook Packages: Professional and Applied ComputingApress Access BooksProfessional and Applied Computing (R0)