OK, that makes sense I guess the point is that if a pull request didn't
relate to a branch off the upstream/master then it would be hard to
demonstrate that a given set of commits completely and exclusively
encapsulated the change.
Now that I've merged my branches into my master (and pushed that up to
github) it looks like I'm stuck again - do you know how (or if) I can undo
my commits once pushed to my github fork?
John
From: Derrell Lipman <derrell.lip...@unwireduniverse.com>
Reply-To: qooxdoo Development <qooxdoo-devel@lists.sourceforge.net>
Date: Sun, 12 Feb 2012 10:09:19 -0500
To: qooxdoo Development <qooxdoo-devel@lists.sourceforge.net>
Subject: Re: [qooxdoo-devel] Custom event handlers and a pull request
On Sun, Feb 12, 2012 at 09:47, John Spackman <john-li...@zenesis.com> wrote:
> How should I be doing this? It sounds like I have to have my master
> follow the qooxdoo/master, have a branch (from my master) for each
> proposed change (each can have it's own pull request) and then another
> branch (from my master) for my merged changes that I can develop against,
> is that right?
That's exactly correct. Your master branch should track upstream's master
branch. According to a common git paradigm, each task you wish to pursue is
accomplished in a new branch off of master so that only the changes
pertaining to that task are in the branch. This allows you to issue
independent pull requests for each task.
When your tasks are interdependent, you have to decide how to handle it. You
can create a branch for task1, finish it, and then create a new branch task2
from task1's branch instead of from master. Your pull requests would then be
only the task1 stuff in your pull request from task1, and a combined
task1/task2 pull request when issued from task2.
Derrell
----------------------------------------------------------------------------
-- Virtualization & Cloud Management Using Capacity Planning Cloud computing
makes use of virtualization - but cloud computing also focuses on allowing
computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/____________________________
___________________ qooxdoo-devel mailing list
qooxdoo-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/qooxdoo-devel
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
qooxdoo-devel mailing list
qooxdoo-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/qooxdoo-devel
