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

[3.1 -> main] Merge changes needed for crypto primitives #503

Merged
merged 12 commits into from
Jun 22, 2022
Merged

Conversation

larryk85
Copy link
Contributor

Merge PR #498 into main

@larryk85 larryk85 merged commit 0a0a09e into main Jun 22, 2022
@arhag arhag changed the title Merge changes needed for crypto primitives [3.1 -> main] Merge changes needed for crypto primitives Jul 1, 2022
@arhag
Copy link
Member

arhag commented Jul 1, 2022

@larryk85: For the future, don't create a PR to directly merge in a release/* branch into main. From my experience, there are problems that could arise with that approach. In addition, if you need to make changes to resolve conflicts specific to main, you will be forced to switch to another branch anyway.

So always create a branch off of main with some appropriate name and then merge the release branch into it. Then resolve any issues within that branch and create a PR from that branch to the main branch.

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