Tony R Quilkey trq

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.

	<?php

	namespace MFB\Behat\Subcontext;

	use Behat\Gherkin\Node\PyStringNode;
	use Behat\MinkExtension\Context\RawMinkContext;
	use Symfony\Component\Console\Tester\CommandTester;
	use Symfony\Component\EventDispatcher\EventDispatcher;

	/**

	#!/bin/sh


	# Setup some variables needed for bootstrapping the environment
	ROOT=/home/vrde/projectz/myproject
	REPOS=${ROOT}/repos

	export PYTHONPATH=${REPOS}

	<?php

	/**
	* Intention:
	*
	* "testing" environment has a SQLite database configured
	* Run migrations against --env=testing
	*
	* Separate seeds run here per test method will delete the SQLite
	* code tables, and re-create them with codes that fit the needs

	<?php

	$source = $_FILES['name']['tmp_name'];
	$handle = fopen($source, 'r+');
	$filesystem->writeStream('destination/file.txt', $handle);

	if (is_resource($handle)) {
	fclose($handle);
	}

	#!/bin/bash
	# Coding Standards fixer from http://cs.sensiolabs.org/ pre-commit hook for git
	#
	# Based on https://github.com/s0enke/git-hooks
	#
	# @author Soenke Ruempler <[email protected]>
	# @author Sebastian Kaspari <[email protected]>
	#
	# see the README

	#!/bin/sh

	#
	# Forwards SSH agent into a Docker container running in the active
	# docker-machine
	#

	PROGNAME=$(basename $0)

	NAME=$(docker-machine active)

	git remote prune origin
	git branch -r --merged master \| egrep -iv '(master\|develop)' \| sed 's/origin\///g' \| xargs -n 1 git push --delete origin

	#!/bin/bash

	current=$PWD

	cd $HOME

	sudo apt-get install zsh
	chsh -s /bin/zsh $USER

	wget https://thoughtbot.github.io/rcm/debs/rcm_1.3.0-1_all.deb