On Thu, Apr 19, 2012 at 6:36 PM, Comer <comer.dun...@gmail.com> wrote: > Hi Chris, > > On Wednesday, April 18, 2012 11:44:03 PM UTC-4, smichr wrote: >> >> > >> > [ComerMacPro:~] comerduncan% cd sympy >> > [ComerMacPro:~/sympy] comerduncan% git branch >> > master >> > * test1 >> > [ComerMacPro:~/sympy] comerduncan% git branch -D 47b923f >> > error: branch '47b923f' not found. >> > >> > So, what gives? Sorry. >> >> You can't delete the branch you are on :-) move to master first. > > > Well, ok:). However, note > > [ComerMacPro:~/sympy] comerduncan% git branch > master > * test1 > [ComerMacPro:~/sympy] comerduncan% git checkout master > Checking out files: 100% (53/53), done. > Switched to branch 'master' > Your branch is ahead of 'origin/master' by 10 commits. > [ComerMacPro:~/sympy] comerduncan% git branch > * master > test1 > [ComerMacPro:~/sympy] comerduncan% git branch -D 47b923f > error: branch '47b923f' not found. > > I must have things very screwed up... >
git's pretty forgiving. You apparently made changes in the master. If you do "git log" you can see what those changes are and then decide if you should keep them (in which case you can just create a new branch with "git branch my_new_branch"). If you just want to get back your clean master then move to a different branch (like your test1 branch) and then do "git checkout -b master --track origin/master". If you don't want to see the whole commit message when you look at commits, try "git log --oneline" which will give you a one line view. Others may have better suggestions...but that's how I do it. /c -- You received this message because you are subscribed to the Google Groups "sympy" group. To post to this group, send email to sympy@googlegroups.com. To unsubscribe from this group, send email to sympy+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sympy?hl=en.
