This is an automated email from the ASF dual-hosted git repository. protobits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 8cd8adb5d92ab2465ab9236a76e077daf4d768fb Author: Adam Feuer <[email protected]> AuthorDate: Fri Sep 4 14:58:47 2020 -0700 removed alternative rename and merge flow --- Documentation/contributing/making-changes.rst | 56 --------------------------- 1 file changed, 56 deletions(-) diff --git a/Documentation/contributing/making-changes.rst b/Documentation/contributing/making-changes.rst index 88eca47..239433e 100644 --- a/Documentation/contributing/making-changes.rst +++ b/Documentation/contributing/making-changes.rst @@ -213,62 +213,6 @@ squash before submitting the Pull Request: happy, they may suggest squashing and merging again to make a single commit. In this case you would repeat steps 1 through 6. -Alternative to Rebasing -~~~~~~~~~~~~~~~~~~~~~~~ - -This is an alternative way to do it if you don't want to rebase. - -#. Check out my branch - - .. code-block:: bash - - $ git checkout my-branch - - -#. Rename it to ``my-branch-old`` to save it, because we're going to create new clean branch to push: - - .. code-block:: bash - - $ git branch -m my-branch-old - -#. Create a new clean branch with the same name you were using before the last step: - - .. code-block:: bash - - $ git checkout master - $ git checkout -b my-branch - -#. Merge your saved old branch into the new one, telling git to "squash" all your commits into one (note this will - not commit the result; the changed files will be in your staging area, ready to be committed): - - .. code-block:: bash - - $ git merge --squash my-branch-old - -#. Commit the result - - .. code-block:: bash - - $ git commit - -#. Force-push your new clean branch to the remote— this will overwrite all your previous changes in that branch: - - .. code-block:: bash - - $ git push -f --set-upstream origin my-branch - -#. Create a GitHub Pull Request - - A Pull Request is how you ask your upstream to review and merge your changes. - - Here's `GitHub's instructions for creating a Pull Request <https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request>`_. - -#. Get Pull Request feedback and implement changes - - Get suggestions for improvements from reviewers, make changes, and push them to the branch. Once the reviewers are - happy, they may suggest squashing and merging again to make a single commit. In this case you would repeat steps - 1 through 6. - Git Resources -------------
