Re: [Bro-Dev] Merging updates
On May 8, 2014, at 3:01 PM, Robin Sommer 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 thanks Robin! .Seth -- Seth Hall International Computer Science Institute (Bro) because everyone has a network http://www.bro.org/ signature.asc Description: Message signed with OpenPGP using GPGMail ___ bro-dev mailing list bro-dev@bro.org http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev
[Bro-Dev] Merging updates
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 we generally merges and generally commits to master: http://www.bro.org/development/howtos/process.html#committing-to-master http://www.bro.org/development/howtos/process.html#merging-a-topic-branch Robin -- Robin Sommer * Phone +1 (510) 722-6541 * ro...@icir.org ICSI/LBNL* Fax +1 (510) 666-2956 * www.icir.org/robin ___ bro-dev mailing list bro-dev@bro.org http://mailman.icsi.berkeley.edu/mailman/listinfo/bro-dev
