Skip to content

Instantly share code, notes, and snippets.

@Perlence
Perlence / .mintty-gruvbox
Last active January 19, 2017 17:25
gruvbox color scheme for mintty
# Based on dark mode of gruvbox color scheme https://github.com/morhetz/gruvbox/
ForegroundColour=235,219,178
BackgroundColour=40,40,40
CursorColour=235,219,178
Black=40,40,40
BoldBlack=146,131,116
Red=204,36,29
BoldRed=251,73,56
Green=152,151,26
BoldGreen=184,187,38

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
@msackman
msackman / QueueingConsumerCoDel.java
Created May 11, 2012 10:00
QueueingConsumer extended with the CoDel algorithm
// The contents of this file are subject to the Mozilla Public License
// Version 1.1 (the "License"); you may not use this file except in
// compliance with the License. You may obtain a copy of the License
// at http://www.mozilla.org/MPL/
//
// Software distributed under the License is distributed on an "AS IS"
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
// the License for the specific language governing rights and
// limitations under the License.
//