Re: [Bro-Dev] Merging updates

2014-05-13 Thread Seth Hall
On May 8, 2014, at 3:01 PM, Robin Sommer ro...@icir.org wrote: - Jon Siwek is joining the ranks of the Bro Merge Masters(TM). Thanks Jon! - I've updated our Development Process page with some notes on how we generally merges and generally commits to master: Ooh, unexpectedly

[Bro-Dev] Merging updates

2014-05-08 Thread Robin Sommer
Two updates regarding merges: - Jon Siwek is joining the ranks of the Bro Merge Masters(TM). So it's now Jon, Seth, and myself doing merges of topic branches into master across the bro.org repositories. - I've updated our Development Process page with some notes on how