initial update authored by Benjamin ENGEL (ASAM)'s avatar Benjamin ENGEL (ASAM)
...@@ -12,17 +12,22 @@ ...@@ -12,17 +12,22 @@
### [First Time Setup](/docs/project_guidelines/Setup-Guide) ### [First Time Setup](/docs/project_guidelines/Setup-Guide)
--- ---
### Gitlab ### Gitlab
- [Workflow Overview](/docs/gitlab/Overview) - [Workflow Overview](/docs/github/Workflow)
--- - [Markdown in Comments & Issues](/docs/gitlab/Markdown)
- [Available Issue and MR Labels](/docs/gitlab/ASAM-Issue-and-MR-Labels)
- [Commit message guidelines](/docs/gitlab/Commit-Guidelines) ### Github (OSI / Opensource Tools)
- [Workflow Overview](/docs/gitlab/Workflow)
- [Markdown in Comments & Issues](/docs/github/Markdown)
### General Git Guidelines
- [Available Issue and MR Labels](/docs/git/ASAM-Issue-and-MR-Labels)
- [Commit message guidelines](/docs/git/Commit-Guidelines)
- Resolving merge conflicts - Resolving merge conflicts
- [Markdown in Comments & Issues](/docs/gitlab/Comments-in-Gitlab) - [Git](/docs/git/An-Introduction-to-Git)
--- ---
### Other Guides ### Other Guides
- [VSCode](/docs/other-guides/VSCode-Guide) - [VSCode](/docs/other-guides/VSCode-Guide)
- [AsciiDoc](/docs/other-guides/Asciidoc-Guide) - [AsciiDoc](/docs/other-guides/Asciidoc-Guide)
- [Git](/docs/other-guides/An-Introduction-to-Git)
--- ---
... ...
......