search

International-Soil-Radiocarbon-Database / ISRaD

Repository for the development and release of ISRaD data and tools
https://international-soil-radiocarbon-database.github.io/ISRaD/
24 stars 15 forks source link

Dev status #163

Closed jb388 closed 5 years ago

jb388 commented 5 years ago

Just a reminder about "dev" vs. master: 1) Never work directly on the master branch 2) Make a new "dev" branch when you want to develop some new code or implement changes (each one of us could have multiple dev branches). Once you finish what you are working on you should run "build" or some combination of QAQC, checkTempletFiles, and devtools::check to make sure your code doesn't break anything. Finally, submit a pull request to merge your branch back with master. 3) Ideally a "dev" branch will have a short lifespan, as that limits the chances for merge conflicts!

jb388 commented 5 years ago

Also, anyone who has more insight into good development practice, feel free to chime in!

greymonroe commented 5 years ago

naming scheme?

"DEV-user-description"

jb388 commented 5 years ago

@greymonroe Sure, that sounds good.

jb388 commented 5 years ago

In case this process confuses anyone, here's a nice tutorial that explains the process: https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow

jb388 commented 5 years ago

Closing this, as it was an FYI post to begin with.