Figure 2-14 Two Branches with Commits
In order to get the two branches merged, Git has to
compare all the changes that have occurred in the two
branches. You have a text file that exists in both the
master branch and the newfeature branch, and for
simplicity’s sake, there are just a couple of lines of text.
Figure 12-15 shows the master branch text file.
Figure 2-15 Master Branch Text File
In the newfeature branch, this text file has been modified
with some new feature code. Figure 12-16 shows a simple
change made to the text file.