Basic Reqs:
https://twitch.hackpad.com/Merge-Tool-basic-requirements-CzmcGbPThFQ

Early survey results:
https://docs.google.com/a/justin.tv/spreadsheets/d/18Ei4FqfaCuD52SjhpVESP5SYJ6JEVub9NjSq5IBHUgQ

Goal:
Kill brigade!!!!
De-couple merge from deployment

Notes:
Some groups like ability to remove a branch to remove a feature. 
Mukund (ember.js) wants to move from brigade
UI needs
Non-determinate merges?
Brigade usage may lend to a mindset where a branch is associated with an environment (a branch may be noted as “do not merge to prod or it will break”)
People hate conflict resolver branches
Frontend uses brigade. (receive design feedback on a good UI)  Try to get resource from design.
Conflict resolver makes API call to brigade
** Remove/disable conflict resolver in brigade
*Need for design resource

Needs:
Audit of builds:
 - in jenkins?

Bill - remove features from brigade that are un-used/hated
Mike - consul for things not currently 


Attendees:
Bill
Keith
Tarrant
Steven
Pam
Mike


