Might want to note that new commit in the PR. On Wed, Apr 21, 2021 at 4:53 PM Interrante, John A (GE Research, US) < john.interra...@ge.com> wrote:
> Yep. My pull request had no conflicts and I just merged it (after all the > checks passed) without any problem. > > -----Original Message----- > From: Beckerle, Mike <mbecke...@owlcyberdefense.com> > Sent: Wednesday, April 21, 2021 4:34 PM > To: dev@daffodil.apache.org > Subject: EXT: Re: Forgot to squash commits > > I decided to force-push them, but just in case I do have the branch with > the other 3 commits saved and we could recreate the other 3-commit scenario > if necessary. > > So the master is now what it is supposed to be. The bug fix (which was > just adding test cases) having been squashed from 3 commits into 1 (our > usual workflow practice.) > > Outstanding pull requests still have to rebase on top, and conflict > detection should still do the right thing. I checked a couple PRs and they > still show no-conflicts with the base. > > ________________________________ > From: John Wass <jwa...@gmail.com> > Sent: Wednesday, April 21, 2021 4:26 PM > To: dev@daffodil.apache.org <dev@daffodil.apache.org> > Subject: Re: Forgot to squash commits > > I'd let them be. > > On Wed, Apr 21, 2021 at 4:13 PM Beckerle, Mike < > mbecke...@owlcyberdefense.com> wrote: > > > I ended up committing 3 tiny commits to master, forgot to squash them. > > > > Should I fix this by force push? > > > > Mike Beckerle | Principal Engineer > > > > mbecke...@owlcyberdefense.com <bhum...@owlcyberdefense.com> P > > +1-781-330-0412 > > > > Connect with us! > > > > <https://www.linkedin.com/company/owlcyberdefense/> > > <https://twitter.com/owlcyberdefense> > > > > <https://owlcyberdefense.com/resources/events/> > > > > > > > > The information contained in this transmission is for the personal and > > confidential use of the individual or entity to which it is addressed. > > If the reader is not the intended recipient, you are hereby notified > > that any review, dissemination, or copying of this communication is > > strictly prohibited. If you have received this transmission in error, > > please notify the sender immediately > > >
