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!