ranchodeluxe commented 4 months ago

Problem

This repository (unlike the other VEDA repositories) can decide on what our Gitflow options we want. Currently we create feature branches off conus-dps (the default branch) that get merged. But there are other options

AC

[ ] Talk about and pic something

ranchodeluxe commented 4 months ago

@jsignell is recommending that we merge conus-dps to main and make main the default branch

jsignell commented 4 months ago

Oh I was thinking just delete main and rename conus-dps to main 🙈 but your idea is better.

zebbecker commented 2 months ago

If we decide on a git flow, I will write it up and add to documentation.

Current concept:

rename conus-dps to main
develop features in feature branches directly off of main
merge feature branches back into main when completed
any PRs to main will automatically trigger both the normal test suite and --runslow integration tests
to put new features into production, follow the release workflow once all needed PRs have been merged into main

This seems fine to me, but I have less experience with different options than you two do @jsignell @ranchodeluxe . Does this sound good? Or, we can set something up with a dev branch in addition to a main branch, or another option.

jsignell commented 2 months ago

This sounds like the standard approach to managing development on a library. So big :+1: from me. One thing that you should definitely consider is branch protection. That lets you control what can get merged to main. For instance you can specify that there has to be a review, or that the tests have to pass.

zebbecker commented 1 month ago

Completed in #161

Earth-Information-System / fireatlas

Decide on Gitflow Workflow and Document for Future Us #95

Problem

AC