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

[Tarek Soliman]

On Wed, Apr 27, 2011 at 05:39:56PM +0200, Max Horn wrote:
> for various reasons I thought it'd be a good idea to explain how to make good use of the github fork feature, and to describe a basic workflow involving your personal fork of the scummvm repository. I guess a version of this should be put onto a Wiki page. There are several people on this list who know a lot more about git than I do, and maybe they can help improve this guide, and correct its flaws.

I was wondering how to handle rework that's based on pull requests.

A rebase followed by a force-push will confuse the comment trail and possibly
nuke any commit-specific comments for the commits sha1s that are not longer
there. (I am too afraid to try)

It seems that to render the pull request page, it adds the commits as if they
were comments based on the commit date. With rebasing it is easy to confuse it
if you were to change a middle commit (putting a new date on it) it put that
middle commit last (because it sorts on dates).

The other thing I am used to with git is following multiple paths by branching.
A pull request only tracks one branch.

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.
-- 
Tarek