You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@daffodil.apache.org by "Beckerle, Mike" <mb...@owlcyberdefense.com> on 2021/04/21 20:13:24 UTC
Forgot to squash commits
I ended up committing 3 tiny commits to master, forgot to squash them.
Should I fix this by force push?
Mike Beckerle | Principal Engineer
[cid:7cdf72d7-2aa7-4d28-b9d3-bc7fa7c525a1]
mbeckerle@owlcyberdefense.com<ma...@owlcyberdefense.com>
P +1-781-330-0412
Connect with us!
[cid:30d2c816-c306-4257-867b-9c6395fea667]<https://www.linkedin.com/company/owlcyberdefense/>[cid:153579d6-aa11-448c-ab90-fec19584e663]<https://twitter.com/owlcyberdefense>
[cid:d267645d-3247-4fab-97fe-fd60a4dd0301]<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
Re: Forgot to squash commits
Posted by John Wass <jw...@gmail.com>.
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.Interrante@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 <mb...@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 <jw...@gmail.com>
> Sent: Wednesday, April 21, 2021 4:26 PM
> To: dev@daffodil.apache.org <de...@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 <
> mbeckerle@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
> >
> > mbeckerle@owlcyberdefense.com <bh...@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
> >
>
RE: Forgot to squash commits
Posted by "Interrante, John A (GE Research, US)" <Jo...@ge.com>.
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 <mb...@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 <jw...@gmail.com>
Sent: Wednesday, April 21, 2021 4:26 PM
To: dev@daffodil.apache.org <de...@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 < mbeckerle@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
>
> mbeckerle@owlcyberdefense.com <bh...@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
>
Re: Forgot to squash commits
Posted by "Beckerle, Mike" <mb...@owlcyberdefense.com>.
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 <jw...@gmail.com>
Sent: Wednesday, April 21, 2021 4:26 PM
To: dev@daffodil.apache.org <de...@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 <
mbeckerle@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
>
> mbeckerle@owlcyberdefense.com <bh...@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
>
Re: Forgot to squash commits
Posted by John Wass <jw...@gmail.com>.
I'd let them be.
On Wed, Apr 21, 2021 at 4:13 PM Beckerle, Mike <
mbeckerle@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
>
> mbeckerle@owlcyberdefense.com <bh...@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
>
RE: Forgot to squash commits
Posted by "Interrante, John A (GE Research, US)" <Jo...@ge.com>.
My pull request (runtime2, #532) has been approved and I'm just waiting for the checks to finish before merging it. I'm not sure how a force push to the master branch would affect any outstanding pull requests. But I'm willing to wait for the force-push before merging my pull request if you decide to go ahead.
From: Beckerle, Mike <mb...@owlcyberdefense.com>
Sent: Wednesday, April 21, 2021 4:13 PM
To: dev@daffodil.apache.org
Subject: EXT: Forgot to squash commits
I ended up committing 3 tiny commits to master, forgot to squash them.
Should I fix this by force push?
Mike Beckerle | Principal Engineer
[cid:7cdf72d7-2aa7-4d28-b9d3-bc7fa7c525a1]
mbeckerle@owlcyberdefense.com<ma...@owlcyberdefense.com>
P +1-781-330-0412
Connect with us!
[cid:30d2c816-c306-4257-867b-9c6395fea667]<https://www.linkedin.com/company/owlcyberdefense/>[cid:153579d6-aa11-448c-ab90-fec19584e663]<https://twitter.com/owlcyberdefense>
[cid:d267645d-3247-4fab-97fe-fd60a4dd0301]<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
Re: Forgot to squash commits
Posted by Steve Lawrence <sl...@apache.org>.
Fine with me. It was merged recently and not much activity right now so
no concern for lost commits.
On 4/21/21 4:13 PM, Beckerle, Mike 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
>
> mbeckerle@owlcyberdefense.com <ma...@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
>