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

Update merge-keep profile resolution examples. #22

Conversation

bradh
Copy link

@bradh bradh commented Dec 31, 2019

Committer Notes

These are essentially identical, since keep is the default.

This needs more careful review - I think I'm doing what the spec asked for, but because I have trouble with the concept of producing invalid catalogs as expected behaviour, maybe it went sideways.

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you squashed any non-relevant commits and commit messages? [instructions]
  • Do all automated CI/CD checks pass?

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your core changes, as applicable?
  • Have you included examples of how to use your new feature(s)?
  • Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

These are essentially identical, since keep is the default.
@wendellpiez wendellpiez force-pushed the profile-resolution-ng-repaired branch 2 times, most recently from 918d284 to 2fccd6a Compare January 7, 2020 15:52
@wendellpiez wendellpiez merged commit 9f7a33b into wendellpiez:profile-resolution-ng-repaired Jan 7, 2020
@bradh bradh deleted the merge_2019-12-31 branch January 8, 2020 08:52
wendellpiez pushed a commit that referenced this pull request Mar 26, 2020
These are essentially identical, since keep is the default.
wendellpiez pushed a commit that referenced this pull request May 7, 2020
These are essentially identical, since keep is the default.
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