Closed gvanuxem closed 1 year ago
Thanks - your 2 real commits are great and I'm about to merge them.
However, you added a merge-commit from the current main-repo master
which made GH think all was equal and therefore there were no diffs, which I am certain is not what you intended. I have force-pushed to your branch removing that merge-commit.
I did a "rebase" merge which did nothing, because these two commits were already on master
, because you already PR-ed them in #13.
Yes, I supposed that too. But they were pending in my repository. For an unknown reason. So I pulled them just in case. Sorry for the inconvenience.
Le mer. 28 déc. 2022 à 04:33, mohawk2 @.***> a écrit :
I did a "rebase" merge which did nothing, because these two commits were already on master, because you already PR-ed them in #13.
— Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you authored the thread.Message ID: @.***>
That's Ok. The way to check this sort of thing would be to rebase the branch you're using (which should never be master
) against the main master
, and see if any conflicts happen or commits remain. If none remain, there's no action needed :-)
Hello,
And happy new year. Thanks for the return. I think I will delete my PDL- LinearAlgebra repository and re-fork it. I have nothing pending for it so it’s not a problem. However I have some for the NonLinear-Optimization module. They are not pushed in my repository to pull a request, that stil requires substantial work since I saw that several routines need to be updated to reflect thé actual implementation.
Regards,
__ Greg
Le jeu. 5 janv. 2023 à 06:38, mohawk2 @.***> a écrit :
That's Ok. The way to check this sort of thing would be to rebase the branch you're using (which should never be master) against the main master, and see if any conflicts happen or commits remain. If none remain, there's no action needed :-)
— Reply to this email directly, view it on GitHub https://github.com/PDLPorters/pdl-linearalgebra/pull/22#issuecomment-1371802842, or unsubscribe https://github.com/notifications/unsubscribe-auth/AKGLAMCDII4F6TRUUO4XRDTWQZM3TANCNFSM6AAAAAATISKK6E . You are receiving this because you authored the thread.Message ID: @.***>
Happy New Year!
Deleting and reforking is OK, of course, but I found the effort of understanding git well enough to not need to has paid me back hundreds of times. Up to you :-)
For the NonLinear stuff, I look forward to seeing your results!
Coverage: 51.106% (-2.5%) from 53.638% when pulling 33bb81d489930010dd7674d8622be25619f71085 on gvanuxem:master into 61c04d4f9147d18f4ddb7b3760c817c63efa2db3 on PDLPorters:master.