10 Apr
2010
10 Apr
'10
3:09 p.m.
On Saturday 10 April 2010 13:34:39 Stuart Baggs wrote:
Ok I entered git reset --hard 0.9.0 but when I issue a
fresh "git pull" I
get this error:
root@gateway:~/openbsc# git pull
You are not currently on a branch, so I cannot use any
'branch.<branchname>.merge' in your configuration file.
Please specify which branch you want to merge on the command
line and try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
Is there a tar.gz file of the 0.9.0 version of openbts? I am really keen to
get involved in the project but I simply cannot understand how GIT works
and no mattter how many tutorials I read it is still clear as mud.
Hi Stuart,
git can be hard to understand at first but with a basic cheat sheet and just
using a handful commands you should be just fine.
What most likely happened for you is you typed some of the bisect commands I
wrote without actually knowing what they will do and what you will have to do.
What git bisect does is it go away from your default branch to a unnamed
temporary branch to jump in the history...
Now when you type "git pull" it is first fetching objects from the default
remote (origin) and then tries to merge with the remote branch that you are
tracking... The problem is you are currently not on a branch (as the command
tells you) and so it refuses to merge.
All you want to type is "git bisect reset" to go back to before you started
the bisect. which brings you back to the master branch..