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

Enhance 15.5 to 15.6 howto re conflict solution #478 #479

Conversation

phillxnet
Copy link
Member

@phillxnet phillxnet commented Jun 14, 2024

Extend the observed package conflict messages seen to include an addition report from our forum. Identical action listed, but differing Solution # option.

Fixes #478

Checklist

  • With the proposed changes no Sphinx errors or warnings are generated.
  • I have added my name to the AUTHORS file, if required (descending alphabetical order).

Extend the observed package conflict messages seen to
include an addition report from our forum. Identical
action listed, but differing `Solution #` option.
Copy link
Member

@FroggyFlox FroggyFlox left a comment

Choose a reason for hiding this comment

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

Thanks a lot for noticing that one and fixing it right away!
I just found a minor typo.

howtos/15-5_to_15-6.rst Outdated Show resolved Hide resolved
@phillxnet
Copy link
Member Author

@FroggyFlox Thanks for the review: much appreciated.

I do seem to have a penchant for this type of typo. I'll move to final render testing and publish there-after is all look good.

@phillxnet phillxnet merged commit db85e3a into rockstor:master Jun 14, 2024
3 checks passed
@phillxnet phillxnet deleted the 478-Enhance-15.5-to-15.6-howto-re-conflict-solution branch June 14, 2024 14:12
@phillxnet
Copy link
Member Author

PR product PRODUCTION published.

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.

Enhance 15.5 to 15.6 howto re conflict solution
2 participants