diff --git a/external/contribute/supersede/supersede.md b/external/contribute/supersede/supersede.md index ff85410824d138cd369e3763c3149f2af6f0ceaf..6c591bcc8c4835fd7bc7003d59f90e4a4e5d6b0c 100644 --- a/external/contribute/supersede/supersede.md +++ b/external/contribute/supersede/supersede.md @@ -9,7 +9,7 @@ redirect_from: - /external/external/contribute/supersede/ --- -# Supersede a Merge Request +# Take over a stale merge request In some cases, it might be useful to move the Merge Request of a branch opened by someone else to your own fork. @@ -21,9 +21,11 @@ In some cases, it might be useful to move the Merge Request of a branch opened b <img src="img/img1.png" width="700"> </div> -4. This step needs to be performed only the first time. +**Steps 4 and 5 needs to be performed only the first time.** -In the *Terminal window*, type *git remote add upstream [paste the SSH Key]*. +4. If not done yet, configure the git mr command by following those [instructions](https://docs.gitlab.com/ee/user/project/merge_requests/reviews/#checkout-locally-by-adding-a-git-alias). + +5. In the *Terminal window*, type *git remote add upstream [paste the SSH Key]*. You can copy the SSH key of the repository by clicking on Clone - copy on the repository page. <div align="center"> @@ -33,18 +35,18 @@ You can copy the SSH key of the repository by clicking on Clone - copy on the re <img src="img/img2.png" width="300" > </div> -5. In the *Terminal window*, type *git mr upstream [number of the merge request]*. +6. In the *Terminal window*, type *git mr upstream [number of the merge request]*. You are now on the branch of the merge request. -6. Push it to your fork by clicking on the cloud icone on the bottom left of your screen. +7. Push it to your fork by clicking on the cloud icone on the bottom left of your screen. <div align="center"> <img src="img/img4.png" width="100" > </div> -7. On GitLab, open a new Merge Request with the newly created branch. +8. On GitLab, open a new Merge Request with the newly created branch. In description, write ***Supersedes ![number of the original MR]***. -8. In the original MR, write in the description ***Superseded by ![number of the newly created MR]*** and close the MR. \ No newline at end of file +9. In the original MR, write in the description ***Superseded by ![number of the newly created MR]*** and close the MR. \ No newline at end of file