Repository navigation
Conversation
khalford
added
documentation
khalford
force-pushed
the
docs/new_branching_strategy
branch
from
October 9, 2026 10:48
c1edba4 to
08e0789
Compare
dev-0pz
reviewed
Oct 9, 2026
khalford
force-pushed
the
docs/new_branching_strategy
branch
from
October 9, 2026 11:32
08e0789 to
40a14f0
Compare
DavidFair
reviewed
Oct 9, 2026
Contributor
|
I am curious why GitFlow was chosen as its not obvious to me of the benefits over say |
Member
Author
You're right. I will make a new commit |
khalford
force-pushed
the
docs/new_branching_strategy
branch
from
October 29, 2026 09:11
40a14f0 to
1af87d1
Compare
Update the Git branch workflow in the README.md. This follows the feature -> staging -> main workflow. Hopefully this will fix issues we have had with features that are not ready to ship being merged into the release branches. It also describes how hot fixes should be done. I have created a new GitHub workflow to enforce branch merging rules.
khalford
force-pushed
the
docs/new_branching_strategy
branch
from
October 29, 2026 09:35
1af87d1 to
17479fd
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Updated the README to describe the Git branching flow we should use for this project. It follows the usual discipline of
feature -> staging -> main.Adds information on how hotfixes should be handled.
Adds a GitHub workflow to enforce the branch merging rules