Open
Conversation
Member
|
@iolivergithub having tpm2-pkcs11 and totp is nice. I want to accept this PR, but GitHub reports a merge conflict and does not allow me to merge the PR in its current state. It seems you've made changes based on an older version of Docker.release. Please make sure you have the latest master branch before making changes and update this PR. Instead of latest, you could name the branch to represent the features you are adding, for example "add-tpm2pkcs11". Brief example of this https://www.youtube.com/watch?v=JUpKDkb4Zhc Another way to fix the merge conflict is to rebase your current changes on top of latest master, example of this https://www.youtube.com/watch?v=dqVqMwLzOjU&t=126s |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Check the updated dockerfile from the main tpm.dev repo ... I've added stuff to the end but there have been changes to the WolfSSL stuff And the inclusion of the 'acl' library by Dimi today