On Wed, Nov 22, 2017 at 9:06 AM, Arlo Breault <arlo at torproject.org> wrote: > Is it sufficient that there're merely no line conflicts? It's not sufficient, of course! :) As much as possible we should be attempting to run automated tests on our nightly builds. And the most ideal thing is that our patches are upstreamed.