From 8960ad6c0605b5d0c0d1b14d48231c7651689afe Mon Sep 17 00:00:00 2001 From: Dustin Cote Date: Tue, 6 Sep 2016 11:51:45 -0400 Subject: [PATCH] How to contrib changes (#124) --- docs/contributing.rst | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index da35ef7c..91b836ee 100644 --- 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