[Numpy-discussion] datarray repositories have diverged
Thu Sep 30 11:41:42 CDT 2010
The fact that I wasn't around for the sprint probably has a lot to do
with how much the code had diverged. But it's not too bad -- I merged
Fernando's branch into mine and only had to change a couple of things
to make the tests pass.
There seem to be two general patterns for decentralized projects on
GitHub: either you have one de facto leader who owns what everyone
considers the main branch (this is what datarray is doing now, with
Fernando as the leader), or you create a GitHub "organization" that
owns the main branch and make a bunch of key people members of the
organization (which is what numpy is doing).
The way you'd usually get something merged in this kind of project is
to send a pull request to the leader using the "Pull Request" button.
But in this case, I'm basically making my pull request on the mailing
list, because it's not straightforward enough for a simple pull
On Thu, Sep 30, 2010 at 12:22 PM, Lluís <email@example.com> wrote:
> Rob Speer writes:
>> However, I notice that all the new development on datarray is
>> happening on Fernando Perez's branch, which mine diverged from long
>> ago. I forked from Lluis (jesusabdullah)'s branch, which was the most
>> active at the time, and I got all but the most recent changes merged
>> back in. But that branch in turn was never merged back into fperez's.
> Ups! I thought my master branch was obsolete after the first sprint, so
> I deleted it and re-branched from fperez's. Thus, I suppose that
> comparing against my current master won't be useful to you.
> BTW, my fix branches are incomplete (no tests and doc have been
> updated), but in the future, how should they be merged (if they should
> be)? I mean, should datarray fork from the new github numpy into a new
> repository owned by a "datarray" user? I don't know much about how these
> kind of things are managed on github, but I remember some comments about
> "And it's much the same thing with knowledge, for whenever you learn
> something new, the whole world becomes that much richer."
> -- The Princess of Pure Reason, as told by Norton Juster in The Phantom
> NumPy-Discussion mailing list
More information about the NumPy-Discussion