From: Aric Gardner <agardner@linuxfoundation.org>
Date: Fri, 22 Nov 2019 17:58:24 +0000 (-0500)
Subject: Add Block about rebasing a change.
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F62381%2F3;p=releng%2Fdocs.git

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 <agardner@linuxfoundation.org>
Change-Id: I5664064f90f143540dfb3e97e0d9c5bd5383366f
---

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
 ===========