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

Release 0.5.0 #14

Merged
merged 68 commits into from
Mar 6, 2025
Merged

Release 0.5.0 #14

merged 68 commits into from
Mar 6, 2025

Conversation

sosthene-nitrokey
Copy link
Contributor

No description provided.

Cargo.toml Outdated
@@ -1,6 +1,6 @@
[package]
name = "piv-authenticator"
version = "0.4.0"
version = "0.5"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version = "0.5"
version = "0.5.0"

@sosthene-nitrokey
Copy link
Contributor Author

I don't fully understand when the divergence happened. I tried rebasing on top of each other but it leads to plenty of conflicts (and a lot of of skipped previously applied commit). Let's merge this with a merge commit. I think it #7 was rebased and that leads to all the conflics.

@sosthene-nitrokey
Copy link
Contributor Author

Ok, actually rebasing on top of d0a603e worked, which is 2 commits before the 0.4.0 release on trussed-dev.

@sosthene-nitrokey
Copy link
Contributor Author

I think I've got it, though it involved a git rebase -Xtheirs that's not ideal. Now the diff between this branch and nitrokey/main is good.

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.

2 participants