... | ... | @@ -19,27 +19,37 @@ Working with GitLab is straight forward: |
|
|
git pull origin master
|
|
|
```
|
|
|
|
|
|
2. Work on your code
|
|
|
2. Create a new branch to work on:
|
|
|
```bash
|
|
|
git branch WorkBranch
|
|
|
git checkout WorkBranch
|
|
|
```
|
|
|
oder
|
|
|
```bash
|
|
|
git checkout -b WorkBranch
|
|
|
```
|
|
|
|
|
|
3. Work on your code
|
|
|
|
|
|
3. Add your work to git:
|
|
|
4. Add your work to git:
|
|
|
```bash
|
|
|
git add -A
|
|
|
```
|
|
|
|
|
|
4. Commit your work and choose a commit message that shortly describes your work:
|
|
|
5. Commit your work and choose a commit message that shortly describes your work:
|
|
|
```bash
|
|
|
git commit -m "short descriptive message"
|
|
|
```
|
|
|
|
|
|
5. Share your work. Since the master branch is proteced, you have to push into a different branch. You can choose any name you deem suitable – as long as it is not already in use.
|
|
|
6. Share your work. Since the master branch is proteced, you have to push into a different branch. You can choose any name you deem suitable – as long as it is not already in use.
|
|
|
```bash
|
|
|
git push ArbitraryBranchName
|
|
|
```
|
|
|
|
|
|
6. Create a Merge Request: Navigate to MergeRequests in the GitLab Project menu to create a request to merge `ArbitraryBranchName` into master branch. After your code has been successfully tested select `Add to Merge Train` to finalize your merge.
|
|
|
7. Create a Merge Request: Navigate to MergeRequests in the GitLab Project menu to create a request to merge `ArbitraryBranchName` into master branch. After your code has been successfully tested select `Add to Merge Train` to finalize your merge.
|
|
|
|
|
|
That's it.
|
|
|
|
|
|
7. If the Merge Request fails: Remove Merge Conflicts and/or fix faulty code. Move to step 3.
|
|
|
8. If the Merge Request fails: Remove Merge Conflicts and/or fix faulty code. Move to step 3.
|
|
|
|
|
|
For detailed information visit [GitLab Documentation](https://docs.gitlab.com/ee/user/index.html). |
|
|
\ No newline at end of file |