Merge Conflicts and File Diffs¶

Go through merge conflict examples

Include Figure 9 in this discussion with respect to proper handling of merge conflicts versus complete burndowns.

../../_images/xkcd_git_1597.png

Fig. 9 The “burn down” method is for newbies, taken from xkcd.com, comic 1597¶

Git and GitHub Collaborative Workflow Issue Threads and PR Threads