I have the upstream set for sympy and have the branch issue fixed. You or whoever admins the github can close my recent pull request and I'll resubmit within an hour or two.
On Thursday, March 20, 2014 9:27:12 PM UTC-7, Aaron Meurer wrote: > > As Ondrej noted, you should use a branch. Never commit to master. > > Also, when you cloned, did you clone from the SymPy repo or from your > fork? We recommend cloning from the SymPy repo, so that when you pull, > you get the upstream changes. See > https://github.com/sympy/sympy/wiki/development-workflow. > > If you did it wrong, you can fix it. > > git remote set-url origin g...@github.com:sympy/sympy.git > git remote add github g...@github.com:chaserelock/sympy.git > > Then pull using "git pull" and push using "git push github". > > Aaron Meurer > > On Thu, Mar 20, 2014 at 10:51 PM, Chase Relock > <chase....@gmail.com<javascript:>> > wrote: > > Hey all, > > I finalized some changes I made and had earlier but it seems for some > reason > > that the changes I sync'd from the upstream master are counting as my > own. > > https://github.com/sympy/sympy/pull/7314 > > Here is a pull request and you can see in the changes section that many > of > > those are already in the master. If anyone knows an easy solution to > clean > > this up I'd be very appreciative. > > > > -- > > You received this message because you are subscribed to the Google > Groups > > "sympy" group. > > To unsubscribe from this group and stop receiving emails from it, send > an > > email to sympy+un...@googlegroups.com <javascript:>. > > To post to this group, send email to sy...@googlegroups.com<javascript:>. > > > Visit this group at http://groups.google.com/group/sympy. > > To view this discussion on the web visit > > > https://groups.google.com/d/msgid/sympy/38dfac9b-689d-4d4c-8b64-5c1d608d5a2e%40googlegroups.com. > > > > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "sympy" group. To unsubscribe from this group and stop receiving emails from it, send an email to sympy+unsubscr...@googlegroups.com. To post to this group, send email to sympy@googlegroups.com. Visit this group at http://groups.google.com/group/sympy. To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/1efa5d85-e056-455e-a30e-f96b9afbb7dd%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
