On Fri, Feb 25, 2011 at 1:45 PM, Benjamin Root <ben.r...@ou.edu> wrote: > Ok, I am still learning quite a bit about git, please bear with me. > > I am having difficulty completing a pull request that I opened.
In general, I don't think we should close our own pull requests. It short-circuits the review process. > When I try > to merge the changes to upstream, they get rejected. I can merge it back to > my own master, and can even push it up to my github repo's master, but not > matplotlib's master. > > After some investigation, I am left wondering if the cause might be that my > branches were branched off of my (un-updated) master (which tracked my > github's master, not matplotlib's master). I have tried rebasing my > branches, but that doesn't seem to solve the problem. > > I am thoroughly confused. Anybody has ideas? Should I dump my repos and > start fresh? No, don't do that. Which repository are you trying to push to? You probably need to sync up with the remote. See the discussion on "git push" at the end of http://gitref.org/remotes/ ------------------------------------------------------------------------------ Free Software Download: Index, Search & Analyze Logs and other IT data in Real-Time with Splunk. Collect, index and harness all the fast moving IT data generated by your applications, servers and devices whether physical, virtual or in the cloud. Deliver compliance at lower cost and gain new business insights. http://p.sf.net/sfu/splunk-dev2dev _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
