Created
March 30, 2020 17:52
-
-
Save insteps/7bd63123e195b40b23044596d4e4eced to your computer and use it in GitHub Desktop.
rfc: alpinelinux gitlab flow v0.0.1
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
I have been using a similar git-flow for all my codes for sometime now, and have over period of time found it useful. | |
Following it may not be as easy it seems | |
Pros | |
---- | |
1. One has some buffer zone, in event git commits become undesirable and needs reverting. | |
2. More independant nodes can join without much difficulty. |
Following a slightly non-conventional method tends to make the setup easy
- Make the top two public repo checked out at master (not bare repo, this would prevent anyone pushing to master, by default)
- Add RPC or some scripted API to call directly to top 2 repo
2.1 at aports@gitlab, to check things and then push dev branch to upstream dev/aports@git.a.o
2.2 at aports@git.a.o, to check and merge dev->master, and make tags in master
(using api on both 2.1, 2.2 would otherwise save method like pulling from them then pushing to it, and plenty of rebasings)
Some good practices:
- Branch names that are widely used and improves git-flow
a. dev
b. features
c. hotfix
d. staged
e. releases/ (used as prefix, so for release version 1.2.3 becomes releases/1.2.x or releases/1.2) - Commit text-prefixes
Added | Changed | Deprecated | Fixed | Removed | Security
(could be in small-caps)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
git_flow_image