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

Archive old YubiHSM2 documentation #565

Merged
merged 9 commits into from
Feb 3, 2024

Conversation

bkanui
Copy link
Contributor

@bkanui bkanui commented Dec 1, 2023

Two pieces:
-- Copy of latest version of the developers.yubico.com/content/YubiHSM documentation copied to an archive folder /Archive_Old_Dev_Docs.
= Added a Readme to explain this process.
-- Updated all the documentation files in developers.yubico.com/content/YubiHSM
= Removed content from each file
= Added statement: This content is deprecated. See
= Added link to replacement YubiHSM 2 User Guide and link to specific topic within that guide.

@bkanui
Copy link
Contributor Author

bkanui commented Dec 1, 2023

The commits from two years ago are no longer relevant. Can we remove them from the PR? Or reject the changes from those two commits?

@FFincannon FFincannon requested a review from joostd December 12, 2023 23:35
@FFincannon
Copy link
Collaborator

Hi @joostd , can I ask you to please merge this PR? Saqib asked us to move the HSM docs from developers.yubico.com, so we've done that, and these are the redirects. I am making sure that the recent updates to this old content are transferred to the new content on docs.yubico.com, updates such as PR#568

Copy link
Contributor

@joostd joostd left a comment

Choose a reason for hiding this comment

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

There are some merge conflicts that still need to be resolved. See individual comments on affected files (not sure if I commented them all, please check).
Otherwise this PR lgtm!

@bkanui
Copy link
Contributor Author

bkanui commented Jan 31, 2024

Hello @joostd
I apologize for taking so long to resolve your conflicts. I thought I had already cleared them.
Please merge this PR, or let me know if there are other issues. I'll attend to them right away!
Thanks,

@joostd
Copy link
Contributor

joostd commented Jan 31, 2024

For some reason I don't seem to be authorized to merge. Assigning to @elukewalker

@joostd
Copy link
Contributor

joostd commented Jan 31, 2024

There still seem to be some merge conflicts left to fix:

$ git grep ">>>>>>>"
content/Developer_Program/Guides/Securing_Web_Services_with_OTP.adoc:>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
content/Developer_Program/Guides/Touch_triggered_OTP.adoc:>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
content/OTP/Guides/Migrating_to_python-pyhsm.adoc:>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
content/OTP/Guides/Self-hosted_OTP_validation.adoc:>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
content/OTP/OTPs_Explained.adoc:>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
content/Software_Projects/Yubico_OTP/YubiCloud_Connector_Libraries/index.adoc:>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
content/Software_Projects/Yubico_OTP/YubiCloud_Validation_Servers/index.adoc:>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61
content/Software_Projects/Yubico_OTP/Yubico_OTP_Integration_Plug-ins/index.adoc:>>>>>>> 456647ee9dcca05aafc4d68935558d154423db61

@bkanui
Copy link
Contributor Author

bkanui commented Feb 1, 2024

commit b218db6, merge intending to resolve conflicts. message '-a' was a typo.

resolving conflict, round 3
@bkanui
Copy link
Contributor Author

bkanui commented Feb 1, 2024

@joostd Could you please check if there are more conflicts? I went through all the files listed as changed and updated then committed, see commit b218db6. But when I view 'all files' it still shows brown/+ for conflict.

When I check my master branch git responds with branch is up to date with origin/master.
When I check my bk-hsm2-oldbook git respond nothing to commit, working tree clean.
Both seem to be inline with doing a 'simple' update, but it is not working.

I did a test and updated plugins.adoc from pr to git. Still shows conflict.

Any suggestions for how to resolve these? Should I close this PR, update local master, create a new branch, apply changes (I saved off a copy), pull commit and push, make a new PR?

@joostd
Copy link
Contributor

joostd commented Feb 1, 2024

With your latest commits, I no longer see any conflicts. Fine to merge as far as I am concerned!

@FFincannon
Copy link
Collaborator

I know, @elukewalker - I see that too - I just don't understand how those conflicts could be resolved to Joost's satisfaction, and then REAPPEAR !

@elukewalker elukewalker merged commit 91b051a into Yubico:master Feb 3, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants