[Contributing] Clarify the rebase operation

lemoinem · weaverryan · commit e1d344f733d2 · 2014-01-08T21:49:11.000-06:00
I just mentioned the fact that `push -f` is usually required when rebasing and explicit that the "2.2 when bugfixing" is a follow up on the previous example (Not necessarily explicit at first).
diff --git a/contributing/code/patches.rst b/contributing/code/patches.rst
@@ -228,7 +228,8 @@ while to finish your changes):
 
 .. tip::
 
-    Replace `master` with `2.2` if you are working on a bugfix
+    Replace ``master`` with the branch you selected previously (e.g. ``2.2``)
+    if you are working on a bugfix
 
 When doing the ``rebase`` command, you might have to fix merge conflicts.
 ``git status`` will show you the *unmerged* files. Resolve all the conflicts,
@@ -243,7 +244,7 @@ Check that all tests still pass and push your branch remotely:
 
 .. code-block:: bash
 
-    $ git push origin BRANCH_NAME
+    $ git push -f origin BRANCH_NAME
 
 Make a Pull Request
 ~~~~~~~~~~~~~~~~~~~
