Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Revert "Add a few forgotten API_SUFFIX wrappers in the recently changed LAPACKE ?TFSM"" #1059

Merged
merged 1 commit into from
Oct 2, 2024

Conversation

weslleyspereira
Copy link
Collaborator

Reverts #1058.

That got complicated as @martin-frbg predicted in #1057 (comment). Sorry for that.

@martin-frbg
Copy link
Collaborator

Actually I'm a bit unsure what the problem is now, since there were no intervening commits ? My suggestion was simply that merging the second of my original PRs after inadvertently merging the first should be equivalent to, and less noisy in the git history than reverting one and then merging the PR that combined them. Now we're looking at revert&revert-the-revert which is bound to be even more noisy ?

@langou langou merged commit db1bcd2 into master Oct 2, 2024
5 of 13 checks passed
@weslleyspereira
Copy link
Collaborator Author

Actually I'm a bit unsure what the problem is now, since there were no intervening commits ? My suggestion was simply that merging the second of my original PRs after inadvertently merging the first should be equivalent to, and less noisy in the git history than reverting one and then merging the PR that combined them. Now we're looking at revert&revert-the-revert which is bound to be even more noisy ?

Github didn't let us merge your PR #1057 after we accepted #1046. I suspect it is because they shared same commit hashes, if that is really the case. Reverting the merge didn't help.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants