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

Revise branching and forking in contributions and versioning markdown. #1846

Closed
Compton-US opened this issue Jul 10, 2023 · 1 comment · Fixed by #1869
Closed

Revise branching and forking in contributions and versioning markdown. #1846

Compton-US opened this issue Jul 10, 2023 · 1 comment · Fixed by #1869
Assignees

Comments

@Compton-US
Copy link
Contributor

This was identified as an item needing correction/revision with guidance on when someone should create a personal fork of OSCAL versus a feature branch directly in OSCAL.

The file ./versioning-and-branching.md in the https://github.com/usnistgov/OSCAL/tree/feature-1802-oscal-pages branch reads:

All individual work will be done in branches in a personal fork of this repository.
Personal branches should be named using the convention <issue #>-brief-dashed-name.
Once work is complete on a personal branch, the branch should be interactively rebased to tidy any commits. Then a PR should be opened against the target feature-* branch or the develop branch if the changes are to be included in the next release.

During my chat with AJ today around #1798, he indicated that working on a personal fork is no longer mandated. Should this file be updated?

Similar guidance exists in the CONTRIBUTING.md file, the block starting at line 72.

Originally posted by @iMichaela in #1824 (comment)

@aj-stein-nist aj-stein-nist moved this from Todo to In Progress in NIST OSCAL Work Board Jul 27, 2023
@aj-stein-nist aj-stein-nist self-assigned this Jul 27, 2023
@aj-stein-nist aj-stein-nist linked a pull request Aug 1, 2023 that will close this issue
5 tasks
@aj-stein-nist aj-stein-nist moved this from In Progress to Under Review in NIST OSCAL Work Board Aug 1, 2023
@aj-stein-nist aj-stein-nist moved this from Under Review to Done in NIST OSCAL Work Board Aug 2, 2023
@aj-stein-nist
Copy link
Contributor

I had some weirdness where the commits addressing feedback were not pushed correctly as I merged with my itchy trigger finger, but I push it on top of develop as discussed. This work is done and ready for sprint review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging a pull request may close this issue.

2 participants