Ozeias Costa ozscosta

Git DMZ Flow

I've been asked a few times over the last few months to put together a full write-up of the Git workflow we use at RichRelevance (and at Precog before), since I have referenced it in passing quite a few times in tweets and in person. The workflow is appreciably different from GitFlow and its derivatives, and thus it brings with it a different set of tradeoffs and optimizations. To that end, it would probably be helpful to go over exactly what workflow benefits I find to be beneficial or even necessary.

Two developers working on independent features must never be blocked by each other
- No code freeze! Ever! For any reason!
A developer must be able to base derivative work on another developer's work, without waiting for any third party
Two developers working on inter-dependent features (or even the same feature) must be able to do so without interference from (or interfering with) any other parties
Developers must be able to work on multiple features simultaneously, or at lea



	from django.http import FileResponse
	from io import BufferedReader, BytesIO

	def file_response_from_str(content: str, filename: str) -> FileResponse:
	""" Serves a file response from the given string

	Args:
	content: str

	# Salvar num arquivo ~/encode.sh, conceder direito de execução e
	# executar desta forma (adaptar nomes de diretórios e arquivos para seu caso):
	# $ ~/encode.sh ~/Video/bigFile.mp4 ~/Video/smallFile.mp4

	ffmpeg -i "$1" -vcodec h264 -acodec aac "$2"

	# Ask for the user password
	# Script only works if sudo caches the password for a few minutes
	sudo true

	# Install kernel extra's to enable docker aufs support
	# sudo apt-get -y install linux-image-extra-$(uname -r)

	# Add Docker PPA and install latest version
	# sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
	# sudo sh -c "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"

	"use strict";

	/**
	* Hypertext Transfer Protocol (HTTP) response status codes.
	* @see {@link https://en.wikipedia.org/wiki/List_of_HTTP_status_codes}
	*/
	enum HttpStatusCode {

	/**
	* The server has received the request headers and the client should proceed to send the request body

	#!/bin/bash
	# Adicione um novo remote; pode chamá-lo de "upstream":

	git remote add upstream https://github.com/usuario/projeto.git

	# Obtenha todos os branches deste novo remote,
	# como o upstream/master por exemplo:

	git fetch upstream

	document
	.querySelectorAll('button[aria-label^="Aceitar o convite de"]')
	.forEach((btn, i) => setTimeout(() => btn.click(), i + 500));

	/*------------------------------------------
	Responsive Grid Media Queries - 1280, 1024, 768, 480
	1280-1024 - desktop (default grid)
	1024-768 - tablet landscape
	768-480 - tablet
	480-less - phone landscape & smaller
	--------------------------------------------*/
	@media all and (min-width: 1024px) and (max-width: 1280px) { }

	@media all and (min-width: 768px) and (max-width: 1024px) { }