Create a merge Request
In order to merge your repository into the original repository, your branch/forked repository have to be merged into the original repository.
Im finished with editing. What should i do?
Great. Now you have to do following steps:
Updating your local repository
Im just running quickly over some basics. For more details look into git-slides.
# git statusyou can see the current status of your repostitory (branchname, filechanges etc.). Here you can see if your local repostiory is up to date.
# git add fileyou can add a change/file to your repository
# git commityou commit these adds to the repostiory. Note: Now you have to write a short commit message e.g. "Added XYZ".
# git pushyou push your local repository to gitlab.
Create Merge Request
Once you pushed your branch onto gitlab and it passes the pipeline, you can create a merge request. After pushing it onto gitlab, there should be following message in the terminal:
remote: To create a merge request for BrancheName, visit: remote: https://gitlab.com/openCFS/userdocu/-/merge_requests/new?merge_request%5Bsource_branch%5D=BrancheName
Simply click the link, and create a merge request.
Running the pipeline
The pipeline is simply a script, which executes certain commandos and looks if no error are occuring. In our case, the pipeline simply builds the website and if errors are occurring the pipeline fails. Otherwise you are good to go. In the next step the compatibility of your merge request regarding the main repository is checked. If your branch/repo can be merged, one admin gets a message and can approve the merge request.