Difference between revisions of "GIT"
(Git getting started init page) |
m |
||
| Line 13: | Line 13: | ||
Every project in Git is placed in a group, this will keep the Git tidy and clear from random stuff. | 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 <nowiki><code>main</code></nowiki> and a <nowiki><code>develop</code></nowiki> branch. Where development should only be done in the <nowiki><code>develop</code></nowiki> branch. | There should be at least a <nowiki><code>main</code></nowiki> | ||
<nowiki><code>main</code></nowiki> and a <nowiki><code>develop</code></nowiki> branch. Where development should only be done in the <nowiki><code>develop</code></nowiki> branch. | |||
In the <nowiki><code>main</code></nowiki> branch should always be the '''release''' version of the code that is employed in the field. | In the <nowiki><code>main</code></nowiki> branch should always be the '''release''' version of the code that is employed in the field. | ||
Revision as of 14:02, 21 March 2022
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 <code>main</code>
<code>main</code> and a <code>develop</code> branch. Where development should only be done in the <code>develop</code> branch.
In the <code>main</code> 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 <code>tag</code> that specifies the release version.
Every feature shall get a <code>feature</code> branch and every bug shall have a <code>hotfix</code> branch, i.e. <code>feature/xxx</code> or <code>hotfix/xxx</code>.
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. |