richardolsson
commented
6 years ago I have merged this manually now. The merge conflict was because I had made changes to home.html in the most recent version of the original cms branch. I had just added a single line to include a CSS file (as part of my introduction of a CSS styling workflow).
Merge conflicts are common and often not a big deal. To avoid them when possible, make sure you always have the most recent version of the cms branch before you start making new changes. See my previous message with instructions or this GitHub article: https://help.github.com/articles/syncing-a-fork/
Again, great work on this!
Revised template structure: A base template sets up elements that are exist on every page, child templates inherit those. home.html specifies the elements that are unique for the landing page fullwidth.html and centered.html are two generic templates that can be used for any other page type.