On 03/07/2011 10:30 AM, Jouni K. Seppänen wrote: >>> 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
This brings up something that confuses me, together with related questions, and so might be another topic for this part of the docs: 1) How is it that you were able to add commits to a branch of someone else's fork? 2) How should it be decided who merges a pull request, and when? 3) Under what circumstances, if any, should a pull request involving multiple commits be collapsed into a single changeset prior to being merged and pushed? Eric > > 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. > ------------------------------------------------------------------------------ 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
