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

Adding Most Recent Data Bites presentation #651

Merged
merged 3 commits into from
Sep 6, 2024

Conversation

jjahearn22
Copy link
Contributor

@jjahearn22 jjahearn22 commented Sep 5, 2024

Committer Notes

Adding the most recent Data Bites presentation

All Submissions:

  • Have you selected the correct base branch per Contributing guidance?
  • Have you set "Allow edits and access to secrets by maintainers"?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • If applicable, have all FedRAMP Documents Related to OSCAL Adoption affected by the changes in this issue have been updated.?
  • If applicable, does this PR reference the issue it addresses and explain how it addresses the issue?
  • Have you squashed any non-relevant commits and commit messages? [instructions] Has merge commit, will fix up and then merge into master.

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

@jjahearn22 jjahearn22 requested a review from a team as a code owner September 5, 2024 16:46
Copy link
Contributor

@aj-stein-gsa aj-stein-gsa left a comment

Choose a reason for hiding this comment

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

@jjahearn22 can you please follow the PR checklist and allow maintainers to modify your PR branch? If not, I will need you to rebase for me. Thanks!

@jjahearn22
Copy link
Contributor Author

@jjahearn22 can you please follow the PR checklist and allow maintainers to modify your PR branch? If not, I will need you to rebase for me. Thanks!

Hi @aj-stein-gsa , the checkbox is ticked to "allow edits by maintainers" - going through the checklist, and I believe I've settled everything. Let me know if it's not looking that way on your end.

@aj-stein-gsa
Copy link
Contributor

Hi @aj-stein-gsa , the checkbox is ticked to "allow edits by maintainers" - going through the checklist, and I believe I've settled everything. Let me know if it's not looking that way on your end.

Yeah, thanks for doing that. Interestingly, it seems to still deny probably because it is using your copy of the master branch and GitHub may protect that more stringently. I typically clean up merge commits like yours because later, when spelunking and trying to review history commit by commit, it makes the history messy and confusing.

I will merge this into another branch and then clean it up and delete them, unless you know how to rebase. If not, no worries there.

@aj-stein-gsa aj-stein-gsa changed the base branch from master to 651-fixup-merge-commit September 6, 2024 14:00
@aj-stein-gsa aj-stein-gsa merged commit 84dd561 into GSA:651-fixup-merge-commit Sep 6, 2024
4 of 7 checks passed
@aj-stein-gsa
Copy link
Contributor

Sigh, and GitHub took care of it anyway, apologies (I forgot about the squash and cleanup logic they use, I have had less success with that).

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