Jocelyn Demoy jodem

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.

	<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

	<!-- adapted from: https://github.com/pedropaulovc/aws-flow-maven-eclipse-samples
	then upgraded to 1.9.27 and java 1.8 following http://stackoverflow.com/a/28843218/4094090 -->

	<modelVersion>4.0.0</modelVersion>
	<groupId>com.amazonaws.services.simpleworkflow.flow</groupId>
	<artifactId>startstop</artifactId>
	<version>1.8.4</version>

	@binkmail.com
	@bobmail.info
	@chammy.info
	@devnullmail.com
	@letthemeatspam.com
	@mailinater.com
	@mailinator.net
	@mailinator2.com
	@notmailinator.com
	@reallymymail.com

	<!doctype html>
	<title>Site Maintenance</title>
	<style>
	body { text-align: center; padding: 150px; }
	h1 { font-size: 50px; }
	body { font: 20px Helvetica, sans-serif; color: #333; }
	article { display: block; text-align: left; width: 650px; margin: 0 auto; }
	a { color: #dc8100; text-decoration: none; }
	a:hover { color: #333; text-decoration: none; }
	</style>

	frontend main *:80
	acl is_http hdr(X-Forwarded-Proto) http
	redirect prefix https://example.com code 301 if is_http