Eric Firing <efir...@hawaii.edu> writes: >> git pull --ff-only upstream v1.0.x >> >> (This assumes an "upstream" remote pointing to >> `git://github.com/matplotlib/matplotlib.git`.) Then merge your pull > > By default, however, if you have cloned from > g...@github.com:matplotlib/matplotlib.git then instead of "upstream" the > remote will be "origin". > > Are you recommending and assuming that we clone *only* from our > individual github forks, and then add the "upstream" remote to point to > the official repo?
I was assuming that, based on the github instructions: http://help.github.com/fork-a-repo/ But of course there are many ways to do it. We'll have to decide what we like best and stick to it in the manual; I personally don't have any strong opinions on what to call the various repositories. Perhaps "origin" for the central repository and "public" for your own github repo (as in the public counterpart of your private development repo)? >> If everything is fine, push: >> >> git push g...@github.com:matplotlib/matplotlib.git v1.0.x > > Can't this be simplified by using "origin" or "upstream" in place of the > url? Yes, if that's the read-write address. If you cloned from the read-only address, you can't push to it. >> 2. the merge has conflicts > > I encountered that last night. The conflict was a simple one that will > occur often: the CHANGELOG needed to have the new entry prepended, Oh, of course. That's going to occur a lot. >> 5. v1.0.x doesn't merge cleanly into master > > What do you mean by this? What is the symptom? A merge conflict or (probably much less often) a test failure, because v1.0.x and master have diverged in the relevant part. An example is pull request #17, which modifies make.osx: https://github.com/matplotlib/matplotlib/pull/17 But make.osx has changed in master, so while merging this request will not have a merge conflict (at least with current v1.0.x), merging to master will. I created another pull request that includes this one and resolves the merge conflict: https://github.com/matplotlib/matplotlib/pull/30 So when #17 is merged into v1.0.x, #30 should be merged into master. -- Jouni K. Seppänen http://www.iki.fi/jks ------------------------------------------------------------------------------ What You Don't Know About Data Connectivity CAN Hurt You This paper provides an overview of data connectivity, details its effect on application quality, and explores various alternative solutions. http://p.sf.net/sfu/progress-d2d _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
