[Scummvm-devel] How to use your personal github fork

[Marcus Comstedt]

Tarek Soliman <tarek-spam at zeusmail.bounceme.net> writes:

[...]
> What I have been doing so far is to avoid force push (and resort to reverts)
> Is there a better way to go about this?
>
> Maybe having multiple pull requests open for each branch of an idea?
>
> This is all me assuming that we don't want the final push (when the pull
> request is accepted) to contain any of the commit/revert pairs of commits.

I think the sane way to do it (considering how pull requests work on
github today) is the following:

* If you have made a pull request from a branch, only add new commits
  (i.e. add reverts if something should be undone as part of the
  review) to that branch.  Any new commits on the branch will
  automatically be added to the pull request.

* When the review process is finished, if there are reverts or other
  commits which should be squashed, or if there is another reason to
  rebase, create a new branch with the rebased commits and make a new
  pull request from that one.  Close the old pull request, but don't
  delete the branch until the new request has been merged.


  // Marcus