Re: [Gumstix-users] latest git pull breaks bitbake/build

[Neil M. <ne...@gu...>]

hmm.. that worked for me. try this first

$ git checkout master


On 11-01-17 07:41 PM, alxx wrote:
>> You should be able to update using git (assuming you cloned the repo to
>> start out with).
>>
>>    $ cd ~/overo-oe/bitbake
>>    $ git pull
>>    $ git checkout 1.10.2
>>
> Original setup was as per gumstix instructions for bitbake 1.8.18
>
>
> [alxx@localhost bitbake]$ git pull
> You are not currently on a branch, so I cannot use any
> 'branch.<branchname>.merge' in your configuration file.
> Please specify which remote branch you want to use on the command
> line and try again (e.g. 'git pull<repository>  <refspec>').
> See git-pull(1) for details.
>
> [alxx@localhost bitbake]$  git checkout 1.10.2
> error: Untracked working tree file 'MANIFEST.in' would be overwritten by
> merge.
>
> Alex
>
>
>
> ------------------------------------------------------------------------------
> Protect Your Site and Customers from Malware Attacks
> Learn about various malware tactics and how to avoid them. Understand
> malware threats, the impact they can have on your business, and how you
> can protect your company and customers by using code signing.
> http://p.sf.net/sfu/oracle-sfdevnl
> _______________________________________________
> gumstix-users mailing list
> gum...@li...
> https://lists.sourceforge.net/lists/listinfo/gumstix-users