@@ -12,6 +12,12 @@ Welcome to the GitLab space of the Biomedical Signals and Systems group of the U
GitLab is a website that allows you to browse trough GIT repositories. GIT is a version control system which keeps track of changes made to source code. Every time you want your changes to be added to the repository, you make a "commit" and "push" to the GitLab server. If someone else wants your changes, he/she has to "fetch" them from the GitLab server.
## User manuals
*[**Working with GitLab (_normal_)**](https://gitlab.utwente.nl/groups/bss_development/-/wikis/home/Working-with-GitLab-(without-Forks))
*[**Working with GitLab (with _forks, see below_)**](https://gitlab.utwente.nl/groups/bss_development/-/wikis/home/Working-with-GitLab-with-Forks)
*[**Public sharing of your projects**](https://gitlab.utwente.nl/groups/bss_development/-/wikis/home/Public-sharing-of-your-projects-code)
## Working with multiple people on one project
If you work with multiple people on a project, it is important everyone is up to date. If two users _fetch_ the source code on day 1, user A makes changes and _commit / pushes_ these on day 2, and user B makes changes on day 3 without _fetching_ the changes of user A first, user B will have _merging conflict_ issues _pushing_ the changes of day 3. The _merge conflict_ means the server now has two different set of changes it has to apply to the source code state of day 1. If the changes occur in different files, it can merge them, but if the changes relate to the same thing, you have to manually indicate how to merge the changes. To avoid these issues you can take two routes:
