David Briggs sankage

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

	RSpec.configure do \|config\|
	config.before(:suite) do
	DatabaseCleaner.clean_with(:truncation)
	end

	config.before(:each) do
	DatabaseCleaner.strategy = :transaction
	end

	config.before(:each, js: true) do

	#!/usr/bin/env ruby
	require 'base64'
	require 'open-uri'

	# file or url
	def get_css(src)
	if src.start_with? 'http'
	src = src.gsub('\|', '%7C')
	STDERR.puts "# GET #{src}"
	# simulate modern browser to get woff

	@import compass

	$icons: sprite-map("icons/*.png")
	$icons-hd: sprite-map("icons-hd/*.png")

	i
	background: $icons
	display: inline-block
	@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi)
	background: $icons-hd

	Spawn a long-running process in response to a POST request. The
	request spawns a child and immediately redirects, making the request
	non-blocking. The child changes the text on the index page from
	"Running" to "Not running" after finishing its work.

	Instructions:
	ruby app.rb
	visit http://localhost:4567
	push "Run"
	notice the text says "Running"