Re: [Gumstix-users] git pull - changes to autotools.bbclas ??

[Victhor <vic...@gm...>]

If you have done no edits to that file at all, just run a git stash and
you should be fine.
> Updating to latest version using git
> 
> I haven't made any changes to classes/autotools.bbclass
> but I'm still getting the following error/warning
> 
> Is it safe to just let them be overwritten/force it ?
> 
> 
>  git pull
> remote: Counting objects: 441, done.
> remote: Compressing objects: 100% (297/297), done.
> remote: Total 300 (delta 205), reused 0 (delta 0)
> Receiving objects: 100% (300/300), 245.91 KiB | 154 KiB/s, done.
> Resolving deltas: 100% (205/205), completed with 98 local objects.
> >From git://gitorious.org/gumstix-oe/mainline
>    a828e4e..0833d54  org.openembedded.dev -> origin/org.openembedded.dev
>    e3ac25d..58feb7f  overo      -> origin/overo
> Updating 304973a..58feb7f
> error: Your local changes to 'classes/autotools.bbclass' would be
> overwritten by merge.  Aborting.
> Please, commit your changes or stash them before you can merge.
> 
> 
> 
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by Sprint
> What will you do first with EVO, the first 4G phone?
> Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
> _______________________________________________
> gumstix-users mailing list
> gum...@li...
> https://lists.sourceforge.net/lists/listinfo/gumstix-users