GIT - Revision history

Quintenlb at 14:06, 21 March 2022

2022-03-21T14:06:07Z

← Older revision		Revision as of 14:06, 21 March 2022
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~~>		There should be at least a <code>main</code> and a <code>develop</code> branch. Where development should only be done in the <code>develop</code> branch.

	~~<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 <code>main</code> 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~~.		The release that is specified by the engineer should always have a <code>tag</code> that specifies the release version.

	~~The release that is specified by the engineer should always have a <nowiki><code>tag</code></nowiki> 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>.

	Every feature shall get a ~~<nowiki>~~<code>feature</code~~></nowiki~~> branch and every bug shall have a ~~<nowiki>~~<code>hotfix</code~~></nowiki~~> branch, i.e. ~~<nowiki>~~<code>feature/xxx</code~~></nowiki~~> or ~~<nowiki>~~<code>hotfix/xxx</code~~></nowiki~~>.

	The versioning system that is used within EoI is the [https://semver.org/ semantic versioning].		The versioning system that is used within EoI is the [https://semver.org/ semantic versioning].

Quintenlb at 14:02, 21 March 2022

2022-03-21T14:02:49Z

← Older revision		Revision as of 14:02, 21 March 2022
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.

Quintenlb: Git getting started init page

2022-03-21T13:51:56Z

Git getting started init page

New page

== 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 <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.

The release that is specified by the engineer should always have a <nowiki><code>tag</code></nowiki> that specifies the release version.

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

The versioning system that is used within EoI is the [https://semver.org/ semantic versioning].
{| class="wikitable"
|+
!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.
|}