The last chapter was intense, wasn’t it? It talked about what merge conflicts are and when they would happen. You also saw how to resolve them manually. Don’t worry. This chapter is much easier to digest. It covers how to push your branch to remote after a merge conflict. Also, you will see some strategies to adopt to reduce the number of conflicts that might happen. Let’s go!
Pushing After a Conflict Resolution
I’ve made some grammar and style improvements to the text. Here’s the revised version.
As you saw in ...
