On Fri, Mar 1, 2013 at 7:19 PM, Aaron Meurer <asmeu...@gmail.com> wrote: > On Fri, Mar 1, 2013 at 5:14 PM, David Joyner <wdjoy...@gmail.com> wrote:
.... > > This is the issue. You are not on the crypto branch, you are on > master. You need to first switch to the crypto branch (git checkout > crypto), then commit. > > Since you already did this, the solution is to create the crypto > branch off of your master (which has the crypto commit). You can do > > git branch -d crypto # delete your current crypto branch > git branch crypto # create a new one. this will be based off where you > are now, which is master > git checkout master # go back to master > git reset --hard origin/master # put master back where it should be > > WARNING: Make sure you don't have any uncommitted changes before > running the last command (if "git diff" shows you anything, don't do > it, or it will clear those changes). > > At this point, push up the changes (git push github). david@box:~/pythonfiles/sympy$ git push github crypto Everything up-to-date david@box:~/pythonfiles/sympy$ git branch -d crypto Deleted branch crypto (was 0308061). david@box:~/pythonfiles/sympy$ git branch crypto david@box:~/pythonfiles/sympy$ git checkout master Already on 'master' Your branch is ahead of 'origin/master' by 1 commit. david@box:~/pythonfiles/sympy$ git diff david@box:~/pythonfiles/sympy$ git reset --hard origin/master HEAD is now at 0308061 Add Madeleine Ball to the AUTHORS/aboutus. Welcome to SymPy! david@box:~/pythonfiles/sympy$ git push github Counting objects: 14, done. Delta compression using up to 4 threads. Compressing objects: 100% (9/9), done. Writing objects: 100% (10/10), 11.51 KiB, done. Total 10 (delta 5), reused 0 (delta 0) To g...@github.com:wdjoyner/sympy.git 0308061..d9b5c8c crypto -> crypto I clicked the button on my github page. Hope this is okay now. > > Aaron Meurer > ... > -- 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?hl=en. For more options, visit https://groups.google.com/groups/opt_out.
