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

Fix KeyEncryptionAlgorithm ECDH-ES typos #741

Closed
wants to merge 5 commits into from
Closed

Fix KeyEncryptionAlgorithm ECDH-ES typos #741

wants to merge 5 commits into from

Conversation

giotsintsadze
Copy link
Contributor

Please check if it satisfies your requirements.

@Skyllarr
Copy link
Collaborator

@giotsintsadze Thanks! Please rename the commit to be more informative and link the issue in the description

@giotsintsadze
Copy link
Contributor Author

Hello, here is my new commit, giotsintsadze@4cb9c39

i hope it will satisfies the current request

@Skyllarr
Copy link
Collaborator

Skyllarr commented Oct 26, 2023

Hi @giotsintsadze , there are currently 3 commits in this PR. Please squash them into a single commit. Please also link the issue #737 in the description of this PR. Thank you!

@Skyllarr
Copy link
Collaborator

@giotsintsadze You can get a single commit by running these git commands on your typo-fix branch:

git reset --soft HEAD~2
git commit -m "Fix typos in KeyEncryptionAlgorithm ECDH-ES+* enums (#737)"

and then force pushing to your remote. Let me know if you have any questions about this. Thanks

@giotsintsadze
Copy link
Contributor Author

Hey sorry for late, please check if it is done correctly

@sberyozkin sberyozkin changed the title typo fix Fix KeyEncryptionAlgorithm ECDH-ES typos Oct 26, 2023
@sberyozkin
Copy link
Contributor

@giotsintsadze Thanks for the PR. Looks like something has gone wrong now with the commit history, as it now shows 5 commits. At this stage I'd consider creating a new branch, and cherry-picking 4cb9c39, git cherry-pick 4cb9c39f62cb5a2207066d04e221774da5e64d58, or simply add the same update again as it is literally a 2 characters change.
@Skyllarr, are you OK with either of these plans ?

@giotsintsadze
Copy link
Contributor Author

i will refork and make new PR than

@Skyllarr
Copy link
Collaborator

@giotsintsadze Thanks for the PR. Looks like something has gone wrong now with the commit history, as it now shows 5 commits. At this stage I'd consider creating a new branch, and cherry-picking 4cb9c39, git cherry-pick 4cb9c39f62cb5a2207066d04e221774da5e64d58, or simply add the same update again as it is literally a 2 characters change. @Skyllarr, are you OK with either of these plans ?

@sberyozkin Yes that sounds like a good approach now, @giotsintsadze if you decide to submit a new PR you can close this one. Thanks!

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