Skip to content

Instantly share code, notes, and snippets.

View skalnik's full-sized avatar
🐈

Mike Skalnik skalnik

🐈
View GitHub Profile
fdsafdsafjdklavkcxavkadsfdsa
@skalnik
skalnik / merge-conflict.sh
Created February 14, 2013 08:54
A small script that creates a merge conflict
#!/usr/bin/env sh
mkdir merge-conflict
cd merge-conflict
git init
echo 'DevconTLV Yay!' > greeting.txt
git add .
git commit -m 'Initial commit'
git checkout -b conflict
echo 'DevconTLV Woo!' > greeting.txt
git commit -am 'Woo not yay'
Right.
So.
A few things.
You can do this a few ways.
Traditional is a tent. It's the most flexible option, but it's the most expensive. If you get a tent, you will need a sleeping bag and an air mattress.
This adds up to a lot of money.
One alternative is a bivy sack.
It's basically a tentsleepingbag.
It's not something you pitch. You crawl into it. And it zips up around you.
You still probably want an air mattress.
› tail -f tmp/make.log
=> Loading submodules
git submodule update --init --recursive
=> Building deps
make -C vendor
Error: avrdude-5.11.1 already installed
AVRDude already brew installed [or failed]
Error: scons-2.2.0 already installed
1.9.3-p194 in lolz/ on master
› rm bin/*
zsh: sure you want to delete all the files in /Users/skalnik/lolz/bin [yn]? y
1.9.3-p194 in lolz/ on master
› bundle install --binstubs --path vendor/gems --standalone
Using rake (10.0.0)
Updating files in vendor/cache
Your bundle is complete! It was installed into ./vendor/gems
@skalnik
skalnik / gist:3813005
Created October 1, 2012 16:56 — forked from tomelm/gist:3772915
rails presentation outline for skalnik
  • linux users make sure you have sqlite3 and libsqlite3-dev
  • gem install rails
  • why rails?
  • github's on rail!
  • rails new
  • generates a shit ton of file, the fuck is all that for?
  • primarily going to be concerned with app/ and config/
  • routes
  • app/ => MVC
  • models
==> Downloading http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.2.tar.gz
Already downloaded: /Library/Caches/Homebrew/qt-4.8.2.tar.gz
==> ./configure -prefix /opt/github/homebrew/Cellar/qt/4.8.2 -system-libpng -system-zlib -L/usr/X11/lib -I/usr/X11/include -confirm-license -opensource -cocoa -fast -plugin-sql-mysql -no-qt3support -noma
==> make
@skalnik
skalnik / schedule.md
Created May 9, 2012 15:09
Lightning Talk Schedule
  • Jonathan Wallace - Results Only Work Environment
  • Loren Norman - ?
  • Will Farrington - Graphs: Lessons Learned (with science)
  • Chas Lemley - sikuli_ruby
  • Andy Lindeman - Grocer
  • Seth Chisamore - Integration Testing Framework for Opscode

If Time Permits

@skalnik
skalnik / dhh.md
Created April 23, 2012 14:39
RailsConf 2012 Notes

Progress

  • Who doesn't like it?
  • If we look back, we're not programming Cobol anymore, we're not no longer dealing with tons of boiler plate
  • REST was not considered progress/good back in Rails 1.2
  • Ruby 1.9. 1/3rd or so is still on Ruby 1.8. Some don't feel it's even worth it
  • Bundler
  • Asset Pipeline
  • Progress that makes us uncomfortable are good. Pushes our limits. Everyone can