Hi
I i am trying to get the update for make a new nfi without lost my modifications in .bb files and so on.
I try comand git pull but i give some errors :
Code
packages/enigma2/enigma2-plugins.bb: needs update
packages/enigma2/enigma2.bb: needs update
packages/images/dreambox-image.bb: needs update
packages/initscripts/initscripts-1.0/dm8000/bootup: needs update
error: Entry 'packages/enigma2/enigma2-plugins.bb' not uptodate. Cannot merge.so i have try with command git checkout -f and after git pull again but this time it's another problem :
Code
You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either. Please
name 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 on the refspec.
If you often merge with the same branch, you may want to
configure the following variables in your configuration
file:
branch.master.remote = <nickname>
branch.master.merge = <remote-ref>
remote.<nickname>.url = <url>
remote.<nickname>.fetch = <refspec>
See git-config(1) for details.I hope someone can hep me.
Best Regards