Commit f132c659 authored by ljurk's avatar ljurk

add instructions for processing merge requests

parent d8c8ea25
......@@ -50,6 +50,22 @@ step by step(tortoiseGit):
6. while pushing gitlab prints an url, if you visit this url, you can create a merge request for this branch
7. ![](img/branch02.png)
## process merge requests
while merging we dont want to create merge commit messages.
To achieve this we have to edit the repository settings:
`Settings/Merge Requests/Merge method`: choos `Fast-forward merge`
As an alternative you can also process the merge request locally:
1. `git checkout new-feature`
2. `git rebase master`
3. `git checkout master`
4. `git merge --ff-only new-feature`
5. `git push`
## commit messages
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment