-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: John DeAngelis <[email protected]>
- Loading branch information
1 parent
23a1792
commit daa4b03
Showing
2 changed files
with
43 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
# OPRE-OPS Branching Strategy | ||
|
||
The OPRE Team currently uses the following branching strategy: | ||
### main | ||
* `main` is the default and primary branch. This will always be the most up-to-date released code base. | ||
* `main` currently has branch protections in place, and requires a `pull request` with at least `2` approvals from someone on the `dev team`. | ||
|
||
### Feature Branches | ||
* Features should branch from `main` and utilize a naming format of `OPS-{Issue#}/{Feature_Name}`, example: `OPS-522/CAN_Details_Page`. | ||
|
||
```mermaid | ||
--- | ||
title: OPRE-OPS Git Branching | ||
--- | ||
%%{init: {'gitGraph': {'showBranches': true, 'showCommitLabel':true,'mainBranchOrder': 4}} }%% | ||
gitGraph | ||
commit id: "initial commit" | ||
commit | ||
branch OPS-5xx/New_Feature_A | ||
checkout OPS-5xx/New_Feature_A | ||
commit | ||
commit | ||
checkout main | ||
merge OPS-5xx/New_Feature_A | ||
checkout main | ||
commit | ||
branch OPS-6xx/New_Feature_B | ||
checkout OPS-6xx/New_Feature_B | ||
commit | ||
commit | ||
commit | ||
checkout main | ||
merge OPS-6xx/New_Feature_B | ||
``` | ||
|
||
# OPRE-OPS Release Strategy | ||
|
||
The OPRE Team currently uses the following release strategy: | ||
|
||
- When a PR is merged to `main` the GitHub Action `release.yml` will automatically create a new release in | ||
GitHub with next version number. | ||
- The `main` branch will be tagged with the new version number. | ||
- The release will be published to the [GitHub Releases page](https://github.com/HHS/OPRE-OPS/releases). |
This file was deleted.
Oops, something went wrong.