GIT

From 'Engineers of Innovation Wiki'
Jump to navigation Jump to search

Get started with Git

EoI uses GitLab versioning for keeping track of software and firmware development.

The Git URL:

https://git.engineersofinnovation.nl

Git is for members only. Therefore if one wants access they should contact the Git administrators:

Dedier, Floris, Sander or Quinten.

Set-up Git project

Every project in Git is placed in a group, this will keep the Git tidy and clear from random stuff.

There should be at least a main and a develop branch. Where development should only be done in the develop branch.

In the main branch should always be the release version of the code that is employed in the field.

The release that is specified by the engineer should always have a tag that specifies the release version.

Every feature shall get a feature branch and every bug shall have a hotfix branch, i.e. feature/xxx or hotfix/xxx.

The versioning system that is used within EoI is the semantic versioning.

Instance Branch Description
Release main Contains latest used code.
Development develop Contains experimental code that has not been approved yet.
Feature feature/ Contains implemented feature that has not been finished/merged yet towards development branch.
Bug hotfix/ Contains implemented fix that has not been finished/merged yet towards main branch.