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