We have seen two different modes of working with our content managed by Git in earlier chapters, with a gaming analogy calling it the single/solo player mode and multiplayer mode.
Hold on to your seats. This chapter is an answer to your long awaited question: What about the real multiplayer mode with several people playing in parallel? In other words, having multiple people work on the same stuff at the same time.
The concepts that we are going to learn about in this chapter are as follows:
Merging and
Resolving conflicts, making your way through the content in the way you or your team want to