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.

Sign up for GitHub

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

Jump to bottom

Sbfrf contribution guidelines #46

Merged
merged 10 commits into from
May 5, 2023
Merged

Sbfrf contribution guidelines #46

merged 10 commits into from
May 5, 2023

Conversation

SBFRF
Copy link
Member

@SBFRF SBFRF commented Jun 8, 2018 •
edited
Loading

This request is not ready for merge

Tasks left before merge:

  • Establish test procedure from CIRN meeting discussions
    this is related to PR 29 from the wiki

SBFRF added 7 commits June 7, 2018 09:50
@SBFRF
Creating the contribution guidlines file
60dd1e6 
First crack at contribution guidelines, not finished
@SBFRF
updating CONTRIBUTING for repository
b6e59f0 
This included a link to a soon to be added CODE_OF_CONDUCT file
variable name conventions 
merging, testing suggestions
@SBFRF
added code of conduct from template
b42c14f 
I don't know why i can't add this to current branch
@SBFRF
Merge pull request #45 from Coastal-Imaging-Research-Network/SBFRF-Co…
30aa05f 
…ntribution-Guidlines-1

Merged code of conduct to contribution guidelines (don't mind the spelliing)
@SBFRF
Updateing contributing file
758047e 
updated coding conventions from the forum wiki
@SBFRF
Added more changes to contribution guidelines
e07274b 
new guidelines based on other examples
@SBFRF
Updated to contribution guidlines
d2bc368 
added link and description to request role change
SRHarrison
SRHarrison reviewed Jun 8, 2018
View reviewed changes
Copy link

@SRHarrison SRHarrison left a comment

Choose a reason for hiding this comment

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

HI @SBFRF,

Thanks for putting this together.
I want to edit something within this document... What is the appropriate technique to do so? (E.g. edit my contact email in item #6)

@SBFRF
Copy link
Member Author

SBFRF commented Jun 8, 2018 •
edited
Loading

https://github.com/mwgeurts/unit_harness
Here's something that might be worth looking at for testing procedures. There's nice directions for implementation, but some test files would need to be created.

SBFRF added 2 commits June 10, 2018 11:11
@SBFRF
Update CODE_OF_CONDUCT.md
e4880d6 
added megs email
@SBFRF
Update CONTRIBUTING.md
e3f07b6 
updated external documents
@SBFRF
Copy link
Member Author

SBFRF commented Jun 15, 2018

@SRHarrison @KateBrodie @mpalmsten Did we ever come to a conclusion on what testing would be required to merge into both development and into master. My thoughts are they should be 2 different requirements, but I don't know that we ever established this. We also discussed regression testing
@thesser1 has a better understanding of the regression testing needs and how to set it up

We also could create a separate the testing into a new issue and merge this PR in so some rules would be in place

@eswanson-usgs
Copy link
Contributor

Should not be merged into master, should be merged into development first

@eswanson-usgs eswanson-usgs deleted the SBFRF-Contribution-Guidlines branch March 30, 2022 14:07
@SBFRF SBFRF restored the SBFRF-Contribution-Guidlines branch March 31, 2022 00:42
@SBFRF
Copy link
Member Author

SBFRF commented Mar 31, 2022

@eswanson-usgs why don't we change PR to merge to development rather than closing the PR?

@SBFRF SBFRF reopened this Mar 31, 2022
@eswanson-usgs
Copy link
Contributor

@eswanson-usgs why don't we change PR to merge to development rather than closing the PR?

Hi Spicer, I merged a new pull request yesterday into development. I didn't realize I could just use the edit button at the top of the page to change the target branch, that one's my bad. Is it okay if I close this PR since the commits have already been merged?

@burritobrittany burritobrittany merged commit 7455f92 into master May 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SRHarrison SRHarrison SRHarrison left review comments

Assignees

@thesser1 thesser1

@KateBrodie KateBrodie

@chrisleaman chrisleaman

@SBFRF SBFRF

@mitchharley mitchharley

@JennaBrown-USGS JennaBrown-USGS

@bergsmaE bergsmaE

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@SBFRF @eswanson-usgs @SRHarrison @thesser1 @KateBrodie @chrisleaman @mitchharley @JennaBrown-USGS @bergsmaE @burritobrittany