So, generally the goal is to commit the minimal set of commits squashed by contributor. For situations that are wacky and end up with a conflict, I don't think it's a problem. No worries, IMO.
On Fri, Sep 8, 2017 at 10:29 PM, Otto Fowler <[email protected]> wrote: > Is what I did against policy? What should I have done? > I think the committer’s guide is archived btw. > > > On September 8, 2017 at 22:12:27, Casey Stella ([email protected]) wrote: > > I don't have an issue with this; it's good to have the explanation. I also > found that we weren't running the dependency analyzer as part of travis > (or, we thought we were, but we weren't) until METRON-1169. Thanks otto > for the explanation and jon for catching it. > > On Fri, Sep 8, 2017 at 10:09 PM, Otto Fowler <[email protected]> > wrote: > > > Yes, that was me. > > > > I was committing a pr, and got an error on this while building and > testing. > > it was introduced by an earlier pr. I sent an email to the list at the > > time: > > > > http://mail-archives.apache.org/mod_mbox/metron-dev/ > > 201708.mbox/%3cCAO2EVT6q-Dcgjs3_DCGjaNXaUyfX-S7ZGn+ > > [email protected]%3e > > > > Basically, while preparing a commit, verify lic. failed because of a > > previously committed dependency change ( which went in without verify > being > > run I can only assume ). > > I fixed the issue in my commit repo and pushed that commit with the pr > > commit after re-testing etc. > > > > > > > > On September 8, 2017 at 20:52:20, [email protected] ([email protected]) > > wrote: > > > > I was looking through some of the recent commits and I noticed this[1], > > anybody know what the back story is there? > > > > 1: > > https://github.com/apache/metron/commit/c8e84fa3be89901013168d15df38b8 > > a58265148a > > > > Jon > > -- > > > > Jon > > > >
