Branches and merge requests
Where the code lives
Section titled “Where the code lives”The repository is antfabric/antfabric-v2/core-v1 on git.geekyants.com, and origin must
point at it. Always push and open merge requests there.
git remote -v# origin git@git.geekyants.com:antfabric/antfabric-v2/core-v1.git (fetch)# origin git@git.geekyants.com:antfabric/antfabric-v2/core-v1.git (push)Branches
Section titled “Branches”| Branch | Is |
|---|---|
main |
Protected. Changes arrive only through merge requests |
setup/base |
The current foundation that feature work starts from and merges into |
feature/<name> |
One feature or one plugin. Merged only after it has been tested |
A feature that builds on another unmerged feature is stacked: its merge request targets the other feature’s branch. When the first one merges with “Delete source branch” ticked, GitLab moves the stacked one onto the base branch, and its diff shrinks to its own changes.
A merge request
Section titled “A merge request”- Says what changes and why, links the plan or issue, and lists how it was checked: commands run, platforms tried (web, desktop, phone), with which accounts.
- Passes CI: lint, type checks, unit tests and builds of the affected projects, the manifest check, an up-to-date API spec, and the backend end-to-end suite against real Postgres, Redis, Temporal, object storage and Mailpit.
- Carries its docs.
- For a plugin, goes through the review checklist.
Commits and pushes
Section titled “Commits and pushes”Commit messages follow the convention. Never push to main; never use
push options that create merge requests automatically — open them deliberately, with a description.