docs(git): adopt git-flow — develop integrates, main holds releases - #6
Closed
krlex wants to merge 1 commit into
Closed
docs(git): adopt git-flow — develop integrates, main holds releases#6krlex wants to merge 1 commit into
krlex wants to merge 1 commit into
Conversation
Every repo now has a permanent 'develop' branch alongside 'main', so the guide has to say what they are for. Contributing guide: - Two long-lived branches, with a diagram: work lands on develop, main changes only when a release is cut. - Branch from develop and target develop in the PR; do not open PRs against main. - Added the release procedure (merge --no-ff develop into main, tag on main, push both to the GitLab mirror) and hotfix handling -- a hotfix branched from main must be merged back into develop or the next release silently reverts it. - Added branch hygiene: delete a feature branch on both remotes once merged. CI/CD page: - Release process starts from a green develop, goes through an rc tag, then merge to main and tag there. The tag is what publishes; tagging develop is only acceptable for a throwaway rc. - The 'a merge to main produces no image' callout now covers both branches.
Contributor
Author
|
Zatvoreno — dokumentacija ne ide u repozitorijum; ostaje lokalno na hostu, a javno se objavljuje samo kroz GitHub Pages sajt. |
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
1 participant
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.
Every repo now has a permanent
developbranch, so the guide has to say what the two branches are for. This PR targetsdevelop, per the rule it introduces.Contributing guide
developintegrates all day-to-day work,mainchanges only when a release is cut.develop, targetdevelopin the PR. No PRs againstmain.git merge --no-ff developintomain, tag onmain, push both to the GitLab mirror.main, merge back intomainand intodevelop— otherwise the next release silently reverts the fix.CI/CD page
develop, goes through an rc tag, then merge tomainand tag there.developis acceptable only for a throwaway rc build.Note on the previous PR
forail-devops#5, merged an hour ago, states "there is no
develbranch in any Forail repo — branch frommain". That was true when written and is now wrong; this supersedes it.