How to contrib changes (#124)

confluentinc · Sep 6, 2016 · 8960ad6 · 8960ad6
1 parent cb8c7bd
commit 8960ad6
Showing 1 changed file with 0 additions and 33 deletions.
diff --git a/docs/contributing.rst b/docs/contributing.rst
@@ -116,36 +116,3 @@ GitHub Workflow
   .. sourcecode:: bash
 
     $ git push origin --force feature-xxx
-
-FAQ
-~~~
-
-Help! I merged changes from upstream and cannot figure out how to resolve conflicts when rebasing!
-
-Never fear! If you occasionally merged upstream/master, here is another way to squash your changes into a single commit:
-
-1. First, rename your existing branch to something else, e.g. `feature-xxx-unclean`
-
-  .. sourcecode:: bash
-
-    $ git branch -m feature-xxx-unclean
-
-
-2. Checkout a new branch with the original name `feature-xxx` from upstream. This branch will supercede our old one.
-
-  .. sourcecode:: bash
-
-  $ git checkout -b feature-xxx upstream/master
-
-3. Then merge your changes in your original feature branch `feature-xxx-unclean` and create a single commit.
-
-  .. sourcecode:: bash
-
-    $ git merge --squash feature-xxx-unclean
-    $ git commit
-
-4. You can now submit this new branch and create or replace your existing pull request.
-
-  .. sourcecode:: bash
-
-    $ git push origin [--force] feature-xxx:feature-xxx