23f14e442c
- Hint essentially states that a user should first update their target branch with upstream changes and then perform the merge. |
||
|---|---|---|
| .. | ||
| conflicts | ||
| creations | ||
| diffs | ||
| dropdowns | ||
| widget | ||
| _by_email_description.html.haml | ||
| _commits.html.haml | ||
| _discussion.html.haml | ||
| _form.html.haml | ||
| _how_to_merge.html.haml | ||
| _merge_request.html.haml | ||
| _merge_requests.html.haml | ||
| _mr_box.html.haml | ||
| _mr_title.html.haml | ||
| _nav_btns.html.haml | ||
| _pipelines.html.haml | ||
| conflicts.html.haml | ||
| edit.html.haml | ||
| index.html.haml | ||
| invalid.html.haml | ||
| show.html.haml | ||