- talked some more about model view controller. Learnt that views are like a sandwich: layouts being the bread, framing its content / filling with a header and a footer - the content being all the other views (meat / cheese / cucumber...)
- added slim and ran html2slim on application.html.erb
- resolved merge conflict. A conflict occurs when the same line in the same document has been changed by different persons (in different commits). Git then is unsure what to make of this. To resolve:
- git rebase master
- solve problem as indicated
- git rebase --continue
- git push -f (commit is not needed again)
- went for a walk around Bernauer Straße memorial site
*Kathi doesn't like the crocodile...
RSS Feed