Chapter 6: Conflicts

New git learner often worry about conflicts. If we plan our branches carefully, the conflicts are usually not difficult to fix.