Git Recipes: A Problem-Solution Approach

CHAPTER 9

Resolving Conflicts

Until now, we mainly have focused on the structure of the graph of revisions. We usually committed using the $ git simple-commit alias; thus, the files we produced were very simple. In fact, almost every file we have created so far contained only one word. Once created, the files were rarely if ever modified. Moreover, the recipes were composed in such a way that we usually used different filenames in different branches. This simplified procedure of committing is a very efficient way of learning the diverse operations on the graph of revision, such as merging and rebasing, for example. However, they do not fully ...