Rapid Rails Girls
  • Home
  • About
  • Contact

Conflict on sandwich*

16/7/2014

1 Comment

 
Picture
  • 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:
  1. git rebase master
  2. solve problem as indicated
  3. git rebase --continue
  4. git push -f (commit is not needed again)
  • went for a walk around Bernauer Straße memorial site


*Kathi doesn't like the crocodile...

1 Comment
Sandwich link
7/12/2014 07:21:07 pm

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.

Reply



Leave a Reply.

    Rails Girls Summer of Code 2014

    Ready for an adventurous journey through the universe of code? We sure are!
    Follow our first steps - stay tuned!

    RSS Feed

    Archives

    September 2014
    August 2014
    July 2014


Powered by Create your own unique website with customizable templates.