From 86df86edf1b316b317a1fa875cd9e3dab5c5e904 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Thu, 19 May 2022 16:38:31 +0300 Subject: [PATCH] Updated How to get your PR merged (markdown) --- How-to-get-your-PR-merged.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/How-to-get-your-PR-merged.md b/How-to-get-your-PR-merged.md index e90ade0..a264f49 100644 --- a/How-to-get-your-PR-merged.md +++ b/How-to-get-your-PR-merged.md @@ -1,16 +1,15 @@ 1. Create you PR (ideally ask in an issue if that is a good idea what you want to do) 2. Wait for a maintainer review -3. Do the requested changes -4. Rebase with `dev` if it is necessary: -```bash -git checkout dev -git pull -git checkout -git rebase dev -## The rebase might consist of several commits, so you might have to do this several times after resolving a collision: -git rebase --continue -### Check if everything works, and no tests fail. - -git push --force -### WARNING: it will push your local changes and erase the difference. It is needed after a rebase. +3. Do the requested changes, and answer any questions raised by the reviewer(s) +4. Rebase on `dev` if necessary: +```console +$ git checkout dev +$ git pull +$ git checkout +$ git rebase dev +$ # The rebase might consist of several commits, so you might have to do this several times after resolving a collision: +$ git rebase --continue +$ # Check if everything works, and no tests fail. +$ git push --force +$ # WARNING: it will push your local changes and erase the difference. It is needed after a rebase. ``` \ No newline at end of file