Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

After your Pull-Request has been accepted, you will need to synchronize your fork with the upstream.  Instructions for doing this are available here: https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork.  Often, a fork will diverge too much from the upstream repository to keep in synchronization properly.  In this case, feel free to create a new private fork, using a new name for removing the old forked repository first, of course.

It is a common practice to delete a fork after the pull-request has been closed.  GitHub even supports a special shortcut to delete your fork.  After the  you the your PR has been closed, go to the https://github.com/apache/incubator-nuttx/pull/NN page (where NN is the PR number that was assigned to your pull request).  You will see this message on that page:

...

Simply click the "Fork Settings" button and confirm that your really want to delete your fork.  This applies only if your PR was submitted from the master branch.  The message and button label will be different if you submitted the PR from a branch:

Multiple BranchesMultiple Forks.  As a general rule it is important not to mix functionally unrelated code into the same pull-request.  Rather, you should consider using multiple forksbranches.  If the current fork branch is tied up waiting for a PR to be closed and you want to submit an unrelated PR, just create a new fork second branch for the second PR.REVISIT: Use of multiple forks would require multiple accounts.  Unlike Bitbucket, GitHub will not let you have multiple forks with different names under the same account. (Note from Nathan: For this reason, each functionally unrelated change should be done in its own branch, with each PR created from the branch. I recommend to always develop on a branch, never on master.).  When the PR has been merged you will provided at option at https://github.com/apache/incubator-nuttx/pull/NN to delete the branch, instead of deleting the whole fork.

Generating a Textual GIT Pull-Request from a Clone

A textual GIT pull-request is similar to a GIT patch, except that it provides additional context that makes it easier to integrate the change with the upstream repository.

...