[Biopython-dev] biopython on github

[Peter]

On Tue, Mar 17, 2009 at 9:34 PM, Brad Chapman <chapmanb at 50mail.com> wrote:
> Hi Peter;
>
>> Using the git command line tool, I was able to pull and merge Brad's
>> changes (as I had made no changes in the meantime this could be done
>> automatically), and then push the merged version back up to github on
>> my branch.  At this point my branch and brad's agreed once again, and
>> the "network" diagram no longer shows both.  Note that my branch now
>> includes a commit from Brad.
>
> Sweet. Glad that worked. I deleted my branch (edit->delete
> repository).

How long did it take to process?  I deleted mine (after attempting to
merge against the CVS mirror).  The delete was still in progress over
12 hours later!

> While doing so, I noticed that there is also a 'Repository
> Collaborators' section within the 'edit' page. So, another working
> model is to have multiple users simultaneously editing one forked
> revision. If you are already communicating on the work through the
> mailing list or wiki, this is more like CVS/SVN then the branching
> model.

Yes, this should be a fairly simple way to give all our current CVS
developers direct access to a master branch on github.

>> Now all this worked, but I was wondering if the github web interface
>> could have simplified any of this, if I'd only know where to click.
>> For example, does github offer any way to view a diff between to
>> branches?  Or, as I suspect, do they simply expect you to use the git
>> tools directly for this?
>
> What was the command you used for this? git diff is still befuddling
> to me.

I didn't actually figure that out (how to do a diff between two
branches on github).  And this afternoon github seems to be down, so I
haven't played with it any more.

Peter