Commit 5fdf34db authored by ljurk's avatar ljurk

fix typo

parent f132c659
......@@ -53,13 +53,14 @@ step by step(tortoiseGit):
## 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`
`Settings/Merge Requests/Merge method`: choose `Fast-forward merge`
As an alternative you can also process the merge request locally:
shell([source](https://shinglyu.com/web/2018/03/25/merge-pull-requests-without-merge-commits.html):
shell([source](https://shinglyu.com/web/2018/03/25/merge-pull-requests-without-merge-commits.html)):
1. `git checkout new-feature`
2. `git rebase master`
3. `git checkout master`
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment