From c374a008dcc20072abd5d967b37b8a64d3cba5a1 Mon Sep 17 00:00:00 2001 From: Aric Gardner Date: Fri, 22 Nov 2019 12:58:24 -0500 Subject: [PATCH] Add Block about rebasing a change. I think this is an used enough idiom for it to warrent inclusion in the gerrit doc. Signed-off-by: Aric Gardner Change-Id: I5664064f90f143540dfb3e97e0d9c5bd5383366f --- docs/gerrit.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/gerrit.rst b/docs/gerrit.rst index 623dd81..14be77d 100644 --- a/docs/gerrit.rst +++ b/docs/gerrit.rst @@ -383,6 +383,21 @@ dependent change and then cherry-pick our patch on top of the change. git review -R +Rebasing a change against master +================================ + +In the case that your patchset cannot be re-based via the U/I (merge conflict) + + .. code-block:: bash + + git pull origin master + git review -d 12345 + git rebase master + "fix conflicts" + git add * + git rebase --continue + git review + Code Review =========== -- 2.16.6