|
|
#BoSSS
|
|
|
## How to work with Gitlab
|
|
|
# BoSSS
|
|
|
|
|
|
### Workflow
|
|
|
## Workflow
|
|
|
The workflow of this repository is build arround one core principle: the master branch must be healthy. To achieve this, [merge trains](https://docs.gitlab.com/ee/ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/)
|
|
|
and continuous testing are combined, utilizing a protected master branch. From the user's perspective this boils down to: Instead of pushing your code into the repository you share your work by submitting a Merge Request.
|
|
|
View the [CI/CD Documentation](https://docs.gitlab.com/ee/ci/introduction/index.html#how-gitlab-cicd-works)
|
|
|
for more detail.
|
|
|
|
|
|
### Hands on example
|
|
|
### How to work with Gitlab
|
|
|
Before all, clone the repository.
|
|
|
Working with GitLab is straight forward:
|
|
|
1. Get the newest code:
|
... | ... | @@ -15,7 +18,7 @@ git pull origin master |
|
|
|
|
|
3. Add your work to git:
|
|
|
```console
|
|
|
git add -A.
|
|
|
git add -A
|
|
|
```
|
|
|
|
|
|
4. Commit your work and choose a commit message that shortly describes your work:
|
... | ... | @@ -32,6 +35,6 @@ git push ArbitraryBranchName |
|
|
|
|
|
That's it.
|
|
|
|
|
|
7. The Merge Request fails:
|
|
|
7. The Merge Request fails: Remove Merge Conflicts and/or fix faulty code. Mov to step 3.
|
|
|
|
|
|
For detailed information visit [GitLab Documentation](https://docs.gitlab.com/ee/user/index.html). |
|
|
\ No newline at end of file |