... | @@ -58,7 +58,13 @@ git push ArbitraryBranchName |
... | @@ -58,7 +58,13 @@ git push ArbitraryBranchName |
|
```
|
|
```
|
|
|
|
|
|
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.
|
|
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.
|
|
|
|
|
|
|
|
To avoid using the web interface, you can also do
|
|
|
|
```bash
|
|
|
|
git push -o merge_request.create origin ArbitraryBranchName
|
|
|
|
```
|
|
|
|
instead of 6. and 7. (TODO: actually test this)
|
|
|
|
|
|
That's it.
|
|
That's it.
|
|
|
|
|
|
8. 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.
|
... | | ... | |