... | ... | @@ -93,7 +93,7 @@ You never commit directly to HEAD. Rather, follow this workflow. |
|
|
|
|
|
* *Relevant issue*. To see what ticket this MR is for, look down the status boxes to find one with "Mentions" in it (the panel is probably about the merge status of the MR). The parent ticket should appear in that list.
|
|
|
|
|
|
* If it says *"Fast-forward merge is not possible. To merge this request, first rebase locally."* then Marge can't rebase your commits on top of master because of a conflict. It's up to you to rebase and force-push the branch, after which Marge will have another go.
|
|
|
* If it says *"Fast-forward merge is not possible. To merge this request, first rebase locally."* then Marge can't rebase your commits on top of master because of a conflict. It's up to you to rebase and force-push the branch, after which Marge will have another go. (NB: It's up to you *even though the "assignee" is still Marge -- this is a bug.)
|
|
|
|
|
|
* But you should ignore *"Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged."* (Note the subtle difference in wording.) In this case Marge is still in control and will do the rebase for you.
|
|
|
|
... | ... | |